From: Ramkumar Ramachandra Date: Tue, 23 Apr 2013 14:02:00 GMT Subject: [PATCH 3/7] am: tighten a conditional that checks for $dotest Message-ID: <1366725724-1016-4-git-send-email-artagnon@gmail.com> 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 --- 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