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

rebase -i: remove now unnecessary directory checks

Browse Source 
Remove directory checks from git-rebase--interactive.sh that are done 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:40 -05:00 committed by Junio C Hamano
parent cf432ca051
commit f3889b8401
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-rebase--interactive.sh
View File

@ -706,8 +706,6 @@ continue)
get_saved_options get_saved_options
comment_for_reflog continue comment_for_reflog continue
test -d "$dotest" || die "No interactive rebase running"
# Sanity check # Sanity check
git rev-parse --verify HEAD >/dev/null || git rev-parse --verify HEAD >/dev/null ||
die "Cannot read HEAD" die "Cannot read HEAD"
@ -749,7 +747,6 @@ abort)
comment_for_reflog abort comment_for_reflog abort
git rerere clear git rerere clear
test -d "$dotest" || die "No interactive rebase running"
headname=$(cat "$dotest"/head-name) headname=$(cat "$dotest"/head-name)
head=$(cat "$dotest"/head) head=$(cat "$dotest"/head)
@ -767,7 +764,6 @@ skip)
comment_for_reflog skip comment_for_reflog skip
git rerere clear git rerere clear
test -d "$dotest" || die "No interactive rebase running"
output git reset --hard && do_rest output git reset --hard && do_rest
;; ;;
@ -780,8 +776,6 @@ fi
test -z "$rebase_root" -a $# -ge 1 -a $# -le 2 || test -z "$rebase_root" -a $# -ge 1 -a $# -le 2 ||
test ! -z "$rebase_root" -a $# -le 1 || usage test ! -z "$rebase_root" -a $# -le 1 || usage
test -d "$dotest" &&
die "Interactive rebase already started"
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"