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

builtin rebase: require a clean worktree

Browse Source 
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:
Pratik Karki 2018-09-04 14:27:14 -07:00 committed by Junio C Hamano
parent bff014dac7
commit e0333e5c63
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

@ -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;