From: Matt Kraai Date: Wed, 26 Sep 2007 01:30:13 GMT Subject: [PATCH] Create .dotest-merge after validating options. Message-ID: <1190770213-8651-1-git-send-email-kraai@ftbfs.org> Creating .dotest-merge before validating the options prevents both --continue and --interactive from working if the options are invalid, so only create it after validating the options. Signed-off-by: Matt Kraai --- git-rebase--interactive.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 2fa53fd..7466b5a 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -406,7 +406,6 @@ do require_clean_work_tree - mkdir "$DOTEST" || die "Could not create temporary $DOTEST" if test ! -z "$2" then output git show-ref --verify --quiet "refs/heads/$2" || @@ -418,6 +417,8 @@ do HEAD=$(git rev-parse --verify HEAD) || die "No HEAD?" UPSTREAM=$(git rev-parse --verify "$1") || die "Invalid base" + mkdir "$DOTEST" || die "Could not create temporary $DOTEST" + test -z "$ONTO" && ONTO=$UPSTREAM : > "$DOTEST"/interactive || die "Could not mark as interactive" -- 1.5.3.2