## You give it a mbox-format collection of emails, and it will try to
## apply them to the kernel using "applypatch"
##
-## applymbox [-u] [-k] [-q] (-c .dotest/msg-number | mail_archive) [Signoff_file]"
-##
## The patch application may fail in the middle. In which case:
## (1) look at .dotest/patch and fix it up to apply
## (2) re-run applymbox with -c .dotest/msg-number for the current one.
## Pay a special attention to the commit log message if you do this and
## use a Signoff_file, because applypatch wants to append the sign-off
## message to msg-clean every time it is run.
+##
+## git-am is supposed to be the newer and better tool for this job.
-. git-sh-setup || die "Not a git archive"
-
-usage () {
- echo >&2 "applymbox [-u] [-k] [-q] (-c .dotest/<num> | mbox) [signoff]"
- exit 1
-}
+USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
+. git-sh-setup
keep_subject= query_apply= continue= utf8= resume=t
while case "$#" in 0) break ;; esac
-k) keep_subject=-k ;;
-q) query_apply=t ;;
-c) continue="$2"; resume=f; shift ;;
+ -m) fall_back_3way=t ;;
-*) usage ;;
*) break ;;
esac
'')
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
case "$query_apply" in
t) touch .dotest/.query_apply
esac
+case "$fall_back_3way" in
+t) : >.dotest/.3way
+esac
case "$keep_subject" in
-k) : >.dotest/.keep_subject
esac
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
;;