summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 13:43:43 -0500
committerJunio C Hamano <gitster@pobox.com>2011-02-10 14:08:08 -0800
commitcaf038cb4ec224ce2fcc241de302a7b37f73963e (patch)
tree9716b1be1423711c45ffb742b67c51d5ceabb685 /git-rebase.sh
parent71786f54c4128821eab8a23f258848c76b5a2071 (diff)
downloadgit-caf038cb4ec224ce2fcc241de302a7b37f73963e.tar.gz
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 0f5f5fb206..265f01df27 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -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