X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-applymbox.sh;h=4e77132ab5f73839241c430d6354d5abb8294d85;hb=d1c5f2a42d7b5c0e3d3862212dea1f09809c4963;hp=a83246cad86c1dc589a226420891074e7017ccfc;hpb=47f0b6d5d49247b85898083d1ccf4f899ef7294a;p=git.git diff --git a/git-applymbox.sh b/git-applymbox.sh index a83246ca..4e77132a 100755 --- 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 ;;