threads / patch / 10023

patchCreate .dotest-merge after validating options.

Subject: [PATCH] Create .dotest-merge after validating options.

## tl;dr

4 messages between Sep 26, 2007 and Sep 27, 2007. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Matt Kraai· Sep 26, 2007, 01:30 UTC · lore

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 <kraai@ftbfs.org>
---
 git-rebase--interactive.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Show changes to git-rebase--interactive.sh +2 −1

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

Johannes Schindelin· Sep 26, 2007, 01:38 UTC · re: Matt Kraai · lore

Re: [PATCH] Create .dotest-merge after validating options.

Hi,

On Tue, 25 Sep 2007, Matt Kraai wrote:

> 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.

Looks very reasonable to me.

Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Ciao, Dscho

Junio C Hamano· Sep 27, 2007, 07:29 UTC · re: Matt Kraai · lore

Re: [PATCH] Create .dotest-merge after validating options.

Matt Kraai <kraai@ftbfs.org> writes:

> 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.

Thanks. Will apply with a minor fixup. Next time, please make sure the testsuite passes before submitting.

Matt Kraai· Sep 27, 2007, 14:03 UTC · re: Junio C Hamano · lore

Re: [PATCH] Create .dotest-merge after validating options.

On Thu, Sep 27, 2007 at 12:29:09AM -0700, Junio C Hamano wrote:

Show 8 quoted lines

> Matt Kraai <kraai@ftbfs.org> writes:
> 
> > 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.
> 
> Thanks.  Will apply with a minor fixup.  Next time, please make
> sure the testsuite passes before submitting.

Will do, thanks.

-- 
Matt