summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 13:43:40 -0500
committerJunio C Hamano <gitster@pobox.com>2011-02-10 14:08:08 -0800
commitf3889b84010f16558421fd45cb3d0062f9d6e024 (patch)
treec1831a3cbc40e8f0d81feece57c453e38f06b949 /git-rebase--interactive.sh
parentcf432ca0512d68afa603941ecddbb45bb7ded01d (diff)
downloadgit-f3889b84010f16558421fd45cb3d0062f9d6e024.tar.gz
rebase -i: remove now unnecessary directory checks
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>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh6
1 files changed, 0 insertions, 6 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9c43c60170..4f4fb29a49 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -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"
@@ -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)
@@ -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
;;
@@ -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"