From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Martin von Zweigbergk <martinvonz@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 3/7] am: tighten a conditional that checks for $dotest
Date: Tue, 23 Apr 2013 19:32:00 +0530 [thread overview]
Message-ID: <1366725724-1016-4-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1366725724-1016-1-git-send-email-artagnon@gmail.com>
We currently assume that, if a $dotest directory exists, an am had
been called earlier. This assumption might get our conditional to
match a stray $dotest directory created somewhere else, and result in
failures down the line. So, tighten the conditional by additionally
looking for the file $dotest/last.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
git-am.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-am.sh b/git-am.sh
index 88aa438..f4ef8fc 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -454,7 +454,7 @@ then
rm -fr "$dotest"
fi
-if test -d "$dotest"
+if test -d "$dotest" && test -f "$dotest/last"
then
case "$#,$skip$resolved$abort" in
0,*t*)
--
1.8.2.1.578.ga933817
next prev parent reply other threads:[~2013-04-23 14:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-23 14:01 [PATCH 0/7] Introduce rebase.autostash Ramkumar Ramachandra
2013-04-23 14:01 ` [PATCH 1/7] am: suppress error output from a conditional Ramkumar Ramachandra
2013-04-23 14:38 ` Martin von Zweigbergk
2013-04-23 16:29 ` Junio C Hamano
2013-04-23 16:31 ` Ramkumar Ramachandra
2013-04-23 17:29 ` Junio C Hamano
2013-04-23 17:31 ` Ramkumar Ramachandra
2013-04-23 14:01 ` [PATCH 2/7] rebase -i: don't error out if $state_dir already exists Ramkumar Ramachandra
2013-04-23 14:45 ` Martin von Zweigbergk
2013-04-23 16:35 ` Junio C Hamano
2013-04-23 16:38 ` Ramkumar Ramachandra
2013-04-23 14:02 ` Ramkumar Ramachandra [this message]
2013-04-23 16:45 ` [PATCH 3/7] am: tighten a conditional that checks for $dotest Junio C Hamano
2013-04-23 14:02 ` [PATCH 4/7] am: don't do housekeeping when rebasing Ramkumar Ramachandra
2013-04-23 16:51 ` Junio C Hamano
2013-04-23 14:02 ` [PATCH 5/7] rebase -i: return control to the caller, for housekeeping Ramkumar Ramachandra
2013-04-23 16:51 ` Martin von Zweigbergk
2013-04-25 14:30 ` Ramkumar Ramachandra
2013-04-23 16:57 ` Junio C Hamano
2013-04-23 14:02 ` [PATCH 6/7] sh-setup: introduce require_clean_work_tree --quiet Ramkumar Ramachandra
2013-04-23 17:00 ` Junio C Hamano
2013-04-23 14:02 ` [PATCH 7/7] rebase: implement --[no-]autostash and rebase.autostash Ramkumar Ramachandra
2013-04-23 17:07 ` Junio C Hamano
2013-04-23 17:34 ` Junio C Hamano
2013-04-23 17:37 ` Ramkumar Ramachandra
2013-04-23 22:45 ` Phil Hord
2013-04-24 8:27 ` Ramkumar Ramachandra
2013-04-24 17:52 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366725724-1016-4-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=martinvonz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).