{"thread":{"id":"10023","subject":"[PATCH] Create .dotest-merge after validating options.","startedAt":"2007-09-26T01:30:13Z","lastAt":"2007-09-27T14:03:13Z","messageCount":4,"participants":["Matt Kraai","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"54074","messageId":"1190770213-8651-1-git-send-email-kraai@ftbfs.org","threadId":"10023","inReplyTo":null,"subject":"[PATCH] Create .dotest-merge after validating options.","fromName":"Matt Kraai","fromEmail":"kraai@ftbfs.org","sentAt":"2007-09-26T01:30:13Z","receivedAt":"2007-09-26T01:30:13Z","isPatch":true,"sender":{"key":"kraai@ftbfs.org","avatar":null},"body":"Creating .dotest-merge before validating the options prevents both\n--continue and --interactive from working if the options are invalid,\nso only create it after validating the options.\n\nSigned-off-by: Matt Kraai <kraai@ftbfs.org>\n---\n git-rebase--interactive.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 2fa53fd..7466b5a 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -406,7 +406,6 @@ do\n \n \t\trequire_clean_work_tree\n \n-\t\tmkdir \"$DOTEST\" || die \"Could not create temporary $DOTEST\"\n \t\tif test ! -z \"$2\"\n \t\tthen\n \t\t\toutput git show-ref --verify --quiet \"refs/heads/$2\" ||\n@@ -418,6 +417,8 @@ do\n \t\tHEAD=$(git rev-parse --verify HEAD) || die \"No HEAD?\"\n \t\tUPSTREAM=$(git rev-parse --verify \"$1\") || die \"Invalid base\"\n \n+\t\tmkdir \"$DOTEST\" || die \"Could not create temporary $DOTEST\"\n+\n \t\ttest -z \"$ONTO\" && ONTO=$UPSTREAM\n \n \t\t: > \"$DOTEST\"/interactive || die \"Could not mark as interactive\"\n-- \n1.5.3.2\n"},{"id":"54075","messageId":"Pine.LNX.4.64.0709260237350.28395@racer.site","threadId":"10023","inReplyTo":"1190770213-8651-1-git-send-email-kraai@ftbfs.org","subject":"Re: [PATCH] Create .dotest-merge after validating options.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-26T01:38:02Z","receivedAt":"2007-09-26T01:38:02Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 25 Sep 2007, Matt Kraai wrote:\n\n> Creating .dotest-merge before validating the options prevents both \n> --continue and --interactive from working if the options are invalid, so \n> only create it after validating the options.\n\nLooks very reasonable to me.\n\nAcked-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nCiao,\nDscho\n"},{"id":"54145","messageId":"7vfy10woqi.fsf@gitster.siamese.dyndns.org","threadId":"10023","inReplyTo":"1190770213-8651-1-git-send-email-kraai@ftbfs.org","subject":"Re: [PATCH] Create .dotest-merge after validating options.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-09-27T07:29:09Z","receivedAt":"2007-09-27T07:29:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matt Kraai <kraai@ftbfs.org> writes:\n\n> Creating .dotest-merge before validating the options prevents both\n> --continue and --interactive from working if the options are invalid,\n> so only create it after validating the options.\n\nThanks.  Will apply with a minor fixup.  Next time, please make\nsure the testsuite passes before submitting.\n"},{"id":"54170","messageId":"20070927140312.GA4499@ftbfs.org","threadId":"10023","inReplyTo":"7vfy10woqi.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Create .dotest-merge after validating options.","fromName":"Matt Kraai","fromEmail":"kraai@ftbfs.org","sentAt":"2007-09-27T14:03:13Z","receivedAt":"2007-09-27T14:03:13Z","isPatch":true,"sender":{"key":"kraai@ftbfs.org","avatar":null},"body":"On Thu, Sep 27, 2007 at 12:29:09AM -0700, Junio C Hamano wrote:\n> Matt Kraai <kraai@ftbfs.org> writes:\n> \n> > Creating .dotest-merge before validating the options prevents both\n> > --continue and --interactive from working if the options are invalid,\n> > so only create it after validating the options.\n> \n> Thanks.  Will apply with a minor fixup.  Next time, please make\n> sure the testsuite passes before submitting.\n\nWill do, thanks.\n\n-- \nMatt\n"}]}