Skip to content

Commit

Permalink
rebase -i: remove now unnecessary directory checks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Martin von Zweigbergk authored and Junio C Hamano committed Feb 10, 2011
1 parent cf432ca commit f3889b8
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,6 @@ continue)
get_saved_options
comment_for_reflog continue

test -d "$dotest" || die "No interactive rebase running"

# Sanity check
git rev-parse --verify HEAD >/dev/null ||
die "Cannot read HEAD"
Expand Down Expand Up @@ -749,7 +747,6 @@ abort)
comment_for_reflog abort

git rerere clear
test -d "$dotest" || die "No interactive rebase running"

headname=$(cat "$dotest"/head-name)
head=$(cat "$dotest"/head)
Expand All @@ -767,7 +764,6 @@ skip)
comment_for_reflog skip

git rerere clear
test -d "$dotest" || die "No interactive rebase running"

output git reset --hard && do_rest
;;
Expand All @@ -780,8 +776,6 @@ fi

test -z "$rebase_root" -a $# -ge 1 -a $# -le 2 ||
test ! -z "$rebase_root" -a $# -le 1 || usage
test -d "$dotest" &&
die "Interactive rebase already started"

git var GIT_COMMITTER_IDENT >/dev/null ||
die "You need to set your committer info first"
Expand Down

0 comments on commit f3889b8

Please sign in to comment.