[PATCH 1/7] am: tighten a conditional that checks for $dotest
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:57:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
In preparation for a later patch that creates $dotest/autostash in git-rebase.sh before anything else happens, don't assume that the presence of a $dotest directory implies the existence of the $dotest/next and $dotest/last files. Look for them explicitly. Signed-off-by: Ramkumar Ramachandra <redacted> --- git-am.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git-am.sh b/git-am.sh
index c092855..ccb854a 100755
--- a/git-am.sh
+++ b/git-am.sh@@ -446,6 +446,8 @@ done # If the dotest directory exists, but we have finished applying all the # patches in them, clear it out. if test -d "$dotest" && + test -f "$dotest/last" && + test -f "$dotest/next" && last=$(cat "$dotest/last") && next=$(cat "$dotest/next") && test $# != 0 &&
@@ -454,7 +456,7 @@ then rm -fr "$dotest" fi -if test -d "$dotest" +if test -d "$dotest" && test -f "$dotest/last" && test -f "$dotest/next" then case "$#,$skip$resolved$abort" in 0,*t*)
--
1.8.3.rc1.51.gd7a04de