Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'

diff --git a/git-am.sh b/git-am.sh
index 1cf3d1dacfb2084e9fcc360a6296900b6f9a7d03..9f4450916cd28578002d04a45b4e28e09cca738c 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -506,6 +506,23 @@ then
        esac
        rm -f "$dotest/dirtyindex"
 else
+       # Possible stray $dotest directory in the independent-run
+       # case; in the --rebasing case, it is upto the caller
+       # (git-rebase--am) to take care of stray directories.
+       if test -d "$dotest" && test -z "$rebasing"
+       then
+               case "$skip,$resolved,$abort" in
+               ,,t)
+                       rm -fr "$dotest"
+                       exit 0
+                       ;;
+               *)
+                       die "$(eval_gettext "Stray \$dotest directory found.
+Use \"git am --abort\" to remove it.")"
+                       ;;
+               esac
+       fi
+
        # Make sure we are not given --skip, --resolved, nor --abort
        test "$skip$resolved$abort" = "" ||
                die "$(gettext "Resolve operation not in progress, we are not resuming.")"