projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add git-am, applymbox replacement.
[git.git]
/
git-applymbox.sh
diff --git
a/git-applymbox.sh
b/git-applymbox.sh
index
a83246c
..
4e77132
100755
(executable)
--- a/
git-applymbox.sh
+++ b/
git-applymbox.sh
@@
-42,7
+42,8
@@
case "$continue" in
'')
rm -rf .dotest
mkdir .dotest
'')
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
shift
esac
@@
-82,7
+83,11
@@
do
do
git-applypatch .dotest/msg-clean .dotest/patch .dotest/info "$signoff"
case "$?" in
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
;;
# 2 is a special exit code from applypatch to indicate that
# the patch wasn't applied, but continue anyway
;;