builtin rebase: support --quit
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>
Pratik Karki committed
Aug 8, 2018 at 20:51 UTC
5a61494539bb549127695d42d7160f0562ed7bf7
1 file changed
+11
builtin/rebase.c
+11
@@ -471,6 +471,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
471
ACTION_CONTINUE,
472
ACTION_SKIP,
473
ACTION_ABORT,
474
+ ACTION_QUIT,
475
} action = NO_ACTION;
476
struct option builtin_rebase_options[] = {
477
OPT_STRING(0, "onto", &options.onto_name,
@@ -500,6 +501,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
501
OPT_CMDMODE(0, "abort", &action,
502
N_("abort and check out the original branch"),
503
ACTION_ABORT),
504
+ OPT_CMDMODE(0, "quit", &action,
505
+ N_("abort but keep HEAD where it is"), ACTION_QUIT),
506
OPT_END(),
507
};
508
@@ -628,6 +631,14 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
631
ret = finish_rebase(&options);
632
goto cleanup;
633
}
634
+ case ACTION_QUIT: {
635
+ strbuf_reset(&buf);
636
+ strbuf_addstr(&buf, options.state_dir);
637
+ ret = !!remove_dir_recursively(&buf, 0);
638
+ if (ret)
639
+ die(_("could not remove '%s'"), options.state_dir);
640
+ goto cleanup;
641
+ }
642
default:
643
die("TODO");
644
}