revised^2: git-daemon extra paranoia, and path DWIM

diff --git a/git-applymbox.sh b/git-applymbox.sh
index a83246cad86c1dc589a226420891074e7017ccfc..4e77132ab5f73839241c430d6354d5abb8294d85 100755 (executable)
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -42,7 +42,8 @@ case "$continue" in
 '')
        rm -rf .dotest
        mkdir .dotest
-       git-mailsplit "$1" .dotest || exit 1
+       num_msgs=$(git-mailsplit "$1" .dotest) || exit 1
+       echo "$num_msgs patch(es) to process."
        shift
 esac
 
@@ -82,7 +83,11 @@ do
     do
        git-applypatch .dotest/msg-clean .dotest/patch .dotest/info "$signoff"
        case "$?" in
-       0 | 2 )
+       0)
+               # Remove the cleanly applied one to reduce clutter.
+               rm -f .dotest/$i
+               ;;
+       2)
                # 2 is a special exit code from applypatch to indicate that
                # the patch wasn't applied, but continue anyway 
                ;;