diff options
author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 21:43:43 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-11 01:08:08 +0300 |
commit | caf038cb4ec224ce2fcc241de302a7b37f73963e (patch) | |
tree | 9716b1be1423711c45ffb742b67c51d5ceabb685 | |
parent | 71786f54c4128821eab8a23f258848c76b5a2071 (diff) |
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>
-rwxr-xr-x | git-rebase--interactive.sh | 2 | ||||
-rwxr-xr-x | git-rebase.sh | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index fbe12a64ec..1ba98a2c67 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -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 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 |