diff options
author | Ramkumar Ramachandra <artagnon@gmail.com> | 2013-05-12 15:56:35 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-13 10:20:07 +0400 |
commit | c30754f188a4f1bcd35d81d898086fea33524bd6 (patch) | |
tree | 8a25aa16802df0a12ba4878aa653941ef445f37d | |
parent | 7d3ccdffb5d28970dd7a4d177cfcca690ccd0c22 (diff) |
am: tighten a conditional that checks for $dotest
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 <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | git-am.sh | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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*) |