mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
rebase: factor out clean work tree check
Remove the check for clean work tree from git-rebase--interactive.sh and rely on the check in git-rebase.sh. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
71786f54c4
commit
caf038cb4e
|
@ -753,8 +753,6 @@ esac
|
|||
git var GIT_COMMITTER_IDENT >/dev/null ||
|
||||
die "You need to set your committer info first"
|
||||
|
||||
require_clean_work_tree "rebase" "Please commit or stash them."
|
||||
|
||||
run_pre_rebase_hook "$upstream_arg" "$@"
|
||||
|
||||
comment_for_reflog start
|
||||
|
|
|
@ -511,10 +511,10 @@ case "$#" in
|
|||
esac
|
||||
orig_head=$branch
|
||||
|
||||
test "$type" = interactive && run_interactive_rebase "$@"
|
||||
|
||||
require_clean_work_tree "rebase" "Please commit or stash them."
|
||||
|
||||
test "$type" = interactive && run_interactive_rebase "$@"
|
||||
|
||||
# Now we are rebasing commits $upstream..$branch (or with --root,
|
||||
# everything leading up to $branch) on top of $onto
|
||||
|
||||
|
|
Loading…
Reference in a new issue