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>
Martin von Zweigbergk committed
Feb 6, 2011 at 13:43 UTC
caf038cb4ec224ce2fcc241de302a7b37f73963e
2 files changed
+2
-4
git-rebase--interactive.sh
-2
@@ -753,8 +753,6 @@ esac
753
git var GIT_COMMITTER_IDENT >/dev/null ||
754
die "You need to set your committer info first"
755
756
-require_clean_work_tree "rebase" "Please commit or stash them."
757
-
756
run_pre_rebase_hook "$upstream_arg" "$@"
757
758
comment_for_reflog start
git-rebase.sh
+2
-2
@@ -511,10 +511,10 @@ case "$#" in
511
esac
512
orig_head=$branch
513
514
-test "$type" = interactive && run_interactive_rebase "$@"
515
-
514
require_clean_work_tree "rebase" "Please commit or stash them."
515
516
+test "$type" = interactive && run_interactive_rebase "$@"
517
+
518
# Now we are rebasing commits $upstream..$branch (or with --root,
519
# everything leading up to $branch) on top of $onto
520