undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin rebase: support keep-empty option

Browse Source 
The `--keep-empty` option can be used to keep the commits that do not
change anything from its parents in the result.

While the scripted version uses `interactive_rebase=implied` to indicate
that the rebase needs to use the `git-rebase--interactive` backend in
non-interactive mode as fallback when figuring out which backend to use,
the C version needs to use a different route because the backend will
already be chosen during the `parse_options()` call.

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:57 -07:00 committed by Junio C Hamano
parent 53f9e5be94
commit 002ee2fe68
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
builtin/rebase.c
View File

@ -95,6 +95,7 @@ struct rebase_options {
const char *action; const char *action;
int signoff; int signoff;
int allow_rerere_autoupdate; int allow_rerere_autoupdate;
int keep_empty;
}; };
static int is_interactive(struct rebase_options *opts) static int is_interactive(struct rebase_options *opts)
@ -103,6 +104,23 @@ static int is_interactive(struct rebase_options *opts)
opts->type == REBASE_PRESERVE_MERGES; opts->type == REBASE_PRESERVE_MERGES;
} }
static void imply_interactive(struct rebase_options *opts, const char *option)
{
switch (opts->type) {
case REBASE_AM:
die(_("%s requires an interactive rebase"), option);
break;
case REBASE_INTERACTIVE:
case REBASE_PRESERVE_MERGES:
break;
case REBASE_MERGE:
/* we silently *upgrade* --merge to --interactive if needed */
default:
opts->type = REBASE_INTERACTIVE; /* implied */
break;
}
}
/* Returns the filename prefixed by the state_dir */ /* Returns the filename prefixed by the state_dir */
static const char *state_dir_path(const char *filename, struct rebase_options *opts) static const char *state_dir_path(const char *filename, struct rebase_options *opts)
{ {
@ -276,6 +294,7 @@ static int run_specific_rebase(struct rebase_options *opts)
opts->allow_rerere_autoupdate < 0 ? "" : opts->allow_rerere_autoupdate < 0 ? "" :
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" : "");
switch (opts->type) { switch (opts->type) {
case REBASE_AM: case REBASE_AM:
@ -588,6 +607,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
&options.allow_rerere_autoupdate, &options.allow_rerere_autoupdate,
N_("allow rerere to update index with resolved " N_("allow rerere to update index with resolved "
"conflict")), "conflict")),
OPT_BOOL('k', "keep-empty", &options.keep_empty,
N_("preserve empty commits during rebase")),
OPT_END(), OPT_END(),
}; };
@ -787,6 +808,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
options.flags |= REBASE_FORCE; options.flags |= REBASE_FORCE;
} }
if (options.keep_empty)
imply_interactive(&options, "--keep-empty");
switch (options.type) { switch (options.type) {
case REBASE_MERGE: case REBASE_MERGE:
case REBASE_INTERACTIVE: case REBASE_INTERACTIVE: