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

rebase: factor out clean work tree check

Browse Source 
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:
Martin von Zweigbergk 2011-02-06 13:43:43 -05:00 committed by Junio C Hamano
parent 71786f54c4
commit caf038cb4e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--interactive.sh
View File

@ -753,8 +753,6 @@ esac
git var GIT_COMMITTER_IDENT >/dev/null || git var GIT_COMMITTER_IDENT >/dev/null ||
die "You need to set your committer info first" 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" "$@" run_pre_rebase_hook "$upstream_arg" "$@"
comment_for_reflog start comment_for_reflog start

4
git-rebase.sh
View File

@ -511,10 +511,10 @@ case "$#" in
esac esac
orig_head=$branch orig_head=$branch
test "$type" = interactive && run_interactive_rebase "$@"
require_clean_work_tree "rebase" "Please commit or stash them." 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, # Now we are rebasing commits $upstream..$branch (or with --root,
# everything leading up to $branch) on top of $onto # everything leading up to $branch) on top of $onto