builtin rebase: support `--autosquash`
This commit adds support for the `--autosquash` option which is used to automatically squash the commits marked as `squash` or `fixup` in their messages. This is converted following `git-legacy-rebase.sh` closely. This option can also be configured via the Git config setting rebase.autosquash. To support this, we also add a custom rebase_config() function in this commit that will be used instead (and falls back to) git_default_config(). Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pratik Karki committed
Sep 4, 2018 at 14:59 UTC
051910a956fd0040bd73f5242f95c4771c86357c
1 file changed
+10
builtin/rebase.c
+10
@@ -96,6 +96,7 @@ struct rebase_options {
96
int signoff;
97
int allow_rerere_autoupdate;
98
int keep_empty;
99
+ int autosquash;
100
};
101
102
static int is_interactive(struct rebase_options *opts)
@@ -295,6 +296,7 @@ static int run_specific_rebase(struct rebase_options *opts)
296
opts->allow_rerere_autoupdate ?
297
"--rerere-autoupdate" : "--no-rerere-autoupdate");
298
add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
299
+ add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
300
301
switch (opts->type) {
302
case REBASE_AM:
@@ -455,6 +457,11 @@ static int rebase_config(const char *var, const char *value, void *data)
457
return 0;
458
}
459
460
+ if (!strcmp(var, "rebase.autosquash")) {
461
+ opts->autosquash = git_config_bool(var, value);
462
+ return 0;
463
+ }
464
+
465
return git_default_config(var, value, data);
466
}
467
@@ -609,6 +616,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
616
"conflict")),
617
OPT_BOOL('k', "keep-empty", &options.keep_empty,
618
N_("preserve empty commits during rebase")),
619
+ OPT_BOOL(0, "autosquash", &options.autosquash,
620
+ N_("move commits that begin with "
621
+ "squash!/fixup! under -i")),
622
OPT_END(),
623
};
624