Remove directory checks from git-rebase--interactive.sh that are done in git-rebase.sh. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx> --- git-rebase--interactive.sh | 6 ------ git-rebase.sh | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 6389a9f..07c10f3 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 ;; @@ -781,8 +777,6 @@ test -n "$strategy" && strategy="-s $strategy" 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" diff --git a/git-rebase.sh b/git-rebase.sh index df4e184..2b19d2f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -324,7 +324,8 @@ then test -z "$onto" && test -z "$preserve_merges" || usage - test -d "$merge_dir" -o -d "$apply_dir" || die "No rebase in progress?" + test -d "$apply_dir" -a -z "$interactive_rebase" || + test -d "$merge_dir" || die "No rebase in progress?" else # Make sure we do not have $apply_dir or $merge_dir if test -z "$do_merge" -- 1.7.3.2.864.gbbb96 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html