* [PATCH] Create .dotest-merge after validating options.
@ 2007-09-26 1:30 Matt Kraai
2007-09-26 1:38 ` Johannes Schindelin
2007-09-27 7:29 ` Junio C Hamano
0 siblings, 2 replies; 4+ messages in thread
From: Matt Kraai @ 2007-09-26 1:30 UTC (permalink / raw)
To: git; +Cc: Matt Kraai
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(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Create .dotest-merge after validating options.
2007-09-26 1:30 [PATCH] Create .dotest-merge after validating options Matt Kraai
@ 2007-09-26 1:38 ` Johannes Schindelin
2007-09-27 7:29 ` Junio C Hamano
1 sibling, 0 replies; 4+ messages in thread
From: Johannes Schindelin @ 2007-09-26 1:38 UTC (permalink / raw)
To: Matt Kraai; +Cc: git
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Create .dotest-merge after validating options.
2007-09-26 1:30 [PATCH] Create .dotest-merge after validating options Matt Kraai
2007-09-26 1:38 ` Johannes Schindelin
@ 2007-09-27 7:29 ` Junio C Hamano
2007-09-27 14:03 ` Matt Kraai
1 sibling, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2007-09-27 7:29 UTC (permalink / raw)
To: Matt Kraai; +Cc: git
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Create .dotest-merge after validating options.
2007-09-27 7:29 ` Junio C Hamano
@ 2007-09-27 14:03 ` Matt Kraai
0 siblings, 0 replies; 4+ messages in thread
From: Matt Kraai @ 2007-09-27 14:03 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Thu, Sep 27, 2007 at 12:29:09AM -0700, Junio C Hamano wrote:
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-09-27 14:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-26 1:30 [PATCH] Create .dotest-merge after validating options Matt Kraai
2007-09-26 1:38 ` Johannes Schindelin
2007-09-27 7:29 ` Junio C Hamano
2007-09-27 14:03 ` Matt Kraai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).