mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin rebase: support --autosquash

Browse Source 
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>
This commit is contained in:
Pratik Karki
2018-09-04 14:59:58 -07:00
committed by Junio C Hamano
parent 002ee2fe68
commit 051910a956
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/rebase.c
View File

@ -96,6 +96,7 @@ struct rebase_options {
int signoff; int signoff;
int allow_rerere_autoupdate; int allow_rerere_autoupdate;
int keep_empty; int keep_empty;
int autosquash;
}; };
static int is_interactive(struct rebase_options *opts) static int is_interactive(struct rebase_options *opts)
@ -295,6 +296,7 @@ static int run_specific_rebase(struct rebase_options *opts)
opts->allow_rerere_autoupdate ? opts->allow_rerere_autoupdate ?
"--rerere-autoupdate" : "--no-rerere-autoupdate"); "--rerere-autoupdate" : "--no-rerere-autoupdate");
add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : ""); add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
switch (opts->type) { switch (opts->type) {
case REBASE_AM: case REBASE_AM:
@ -455,6 +457,11 @@ static int rebase_config(const char *var, const char *value, void *data)
return 0; return 0;
} }
if (!strcmp(var, "rebase.autosquash")) {
opts->autosquash = git_config_bool(var, value);
return 0;
}
return git_default_config(var, value, data); return git_default_config(var, value, data);
} }
@ -609,6 +616,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
"conflict")), "conflict")),
OPT_BOOL('k', "keep-empty", &options.keep_empty, OPT_BOOL('k', "keep-empty", &options.keep_empty,
N_("preserve empty commits during rebase")), N_("preserve empty commits during rebase")),
OPT_BOOL(0, "autosquash", &options.autosquash,
N_("move commits that begin with "
"squash!/fixup! under -i")),
OPT_END(), OPT_END(),
}; };