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>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9c43c601708112b412d6f47443e875de6637e5e3..4f4fb29a49f1b3440cb60fca68f4ad91916522b0 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -706,8 +706,6 @@ continue)
        get_saved_options
        comment_for_reflog 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"
        # 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
        comment_for_reflog abort
 
        git rerere clear

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

 
        headname=$(cat "$dotest"/head-name)
        head=$(cat "$dotest"/head)
 
        headname=$(cat "$dotest"/head-name)
        head=$(cat "$dotest"/head)


@@ -767,7 +764,6 @@ skip)
        comment_for_reflog skip
 
        git rerere clear
        comment_for_reflog skip
 
        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 $# -le 1 || usage
 
 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"
 
 git var GIT_COMMITTER_IDENT >/dev/null ||
        die "You need to set your committer info first"