Skip to content

Commit f3889b8

Browse files
Martin von Zweigbergkgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cf432ca commit f3889b8

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

git-rebase--interactive.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,6 @@ continue)
706706
get_saved_options
707707
comment_for_reflog continue
708708

709-
test -d "$dotest" || die "No interactive rebase running"
710-
711709
# Sanity check
712710
git rev-parse --verify HEAD >/dev/null ||
713711
die "Cannot read HEAD"
@@ -749,7 +747,6 @@ abort)
749747
comment_for_reflog abort
750748

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

754751
headname=$(cat "$dotest"/head-name)
755752
head=$(cat "$dotest"/head)
@@ -767,7 +764,6 @@ skip)
767764
comment_for_reflog skip
768765

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

772768
output git reset --hard && do_rest
773769
;;
@@ -780,8 +776,6 @@ fi
780776

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

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

0 commit comments

Comments
 (0)