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

builtin rebase: support --quit

Browse Source 
With this patch, the builtin rebase handles the `--quit` action which
can be used to abort a rebase without rolling back any changes performed
during the rebase (this is useful when a user forgot that they were in
the middle of a rebase and continued working normally).

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pratik Karki 2018-08-08 20:51:19 +05:45 committed by Junio C Hamano
parent 5e5d96197c
commit 5a61494539
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/rebase.c
View File

@ -471,6 +471,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
ACTION_CONTINUE, ACTION_CONTINUE,
ACTION_SKIP, ACTION_SKIP,
ACTION_ABORT, ACTION_ABORT,
ACTION_QUIT,
} action = NO_ACTION; } action = NO_ACTION;
struct option builtin_rebase_options[] = { struct option builtin_rebase_options[] = {
OPT_STRING(0, "onto", &options.onto_name, OPT_STRING(0, "onto", &options.onto_name,
@ -500,6 +501,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
OPT_CMDMODE(0, "abort", &action, OPT_CMDMODE(0, "abort", &action,
N_("abort and check out the original branch"), N_("abort and check out the original branch"),
ACTION_ABORT), ACTION_ABORT),
OPT_CMDMODE(0, "quit", &action,
N_("abort but keep HEAD where it is"), ACTION_QUIT),
OPT_END(), OPT_END(),
}; };
@ -628,6 +631,14 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
ret = finish_rebase(&options); ret = finish_rebase(&options);
goto cleanup; goto cleanup;
} }
case ACTION_QUIT: {
strbuf_reset(&buf);
strbuf_addstr(&buf, options.state_dir);
ret = !!remove_dir_recursively(&buf, 0);
if (ret)
die(_("could not remove '%s'"), options.state_dir);
goto cleanup;
}
default: default:
die("TODO"); die("TODO");
} }