mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
builtin rebase: require a clean worktree
This commit reads the index of the repository for rebase and checks whether the repository is ready for rebase. 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:
parent
bff014dac7
commit
e0333e5c63
|
@ -19,6 +19,7 @@
|
|||
#include "parse-options.h"
|
||||
#include "commit.h"
|
||||
#include "diff.h"
|
||||
#include "wt-status.h"
|
||||
|
||||
static char const * const builtin_rebase_usage[] = {
|
||||
N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
|
||||
|
@ -479,6 +480,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
die(_("Could not resolve HEAD to a revision"));
|
||||
}
|
||||
|
||||
if (read_index(the_repository->index) < 0)
|
||||
die(_("could not read index"));
|
||||
|
||||
if (require_clean_work_tree("rebase",
|
||||
_("Please commit or stash them."), 1, 1)) {
|
||||
ret = 1;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
/* If a hook exists, give it a chance to interrupt*/
|
||||
if (!ok_to_skip_pre_rebase &&
|
||||
run_hook_le(NULL, "pre-rebase", options.upstream_arg,
|
||||
|
@ -528,6 +538,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
|
||||
ret = !!run_specific_rebase(&options);
|
||||
|
||||
cleanup:
|
||||
strbuf_release(&revisions);
|
||||
free(options.head_name);
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue