mirror of
https://github.com/git/git.git
synced 2024-11-17 14:34:49 +01:00
3727531899
With "-c .dotest/0002" flag, the applymbox command can be told to use existing .dotest/patch file after hand-fixing the patch conflicts for the second patch in the mailbox, and continue on from that message, skipping the already applied first patch in .dotest/0001. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
63 lines
1.7 KiB
Bash
Executable file
63 lines
1.7 KiB
Bash
Executable file
#!/bin/sh
|
|
##
|
|
## "dotest" is my stupid name for my patch-application script, which
|
|
## I never got around to renaming after I tested it. We're now on the
|
|
## second generation of scripts, still called "dotest".
|
|
##
|
|
## Update: Ryan Anderson finally shamed me into naming this "applymbox".
|
|
##
|
|
## You give it a mbox-format collection of emails, and it will try to
|
|
## apply them to the kernel using "applypatch"
|
|
##
|
|
## applymbox [ -c .dotest/msg-number ] [ -q ] 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.
|
|
|
|
query_apply= continue= resume=t
|
|
while case "$#" in 0) break ;; esac
|
|
do
|
|
case "$1" in
|
|
-q) query_apply=t ;;
|
|
-c) continue="$2"; resume=f; shift ;;
|
|
-*) usage ;;
|
|
*) break ;;
|
|
esac
|
|
shift
|
|
done
|
|
|
|
case "$continue" in
|
|
'')
|
|
rm -rf .dotest
|
|
mkdir .dotest
|
|
mailsplit "$1" .dotest || exit 1
|
|
esac
|
|
|
|
case "$query_apply" in
|
|
t) touch .dotest/.query_apply
|
|
esac
|
|
|
|
for i in .dotest/0*
|
|
do
|
|
case "$resume,$continue" in
|
|
f,$i) resume=t;;
|
|
f,*) continue;;
|
|
*)
|
|
mailinfo .dotest/msg .dotest/patch <$i >.dotest/info || exit 1
|
|
git-stripspace < .dotest/msg > .dotest/msg-clean
|
|
;;
|
|
esac
|
|
applypatch .dotest/msg-clean .dotest/patch .dotest/info "$2"
|
|
ret=$?
|
|
if [ $ret -ne 0 ]; then
|
|
# 2 is a special exit code from applypatch to indicate that
|
|
# the patch wasn't applied, but continue anyway
|
|
[ $ret -ne 2 ] && exit $ret
|
|
fi
|
|
done
|
|
# return to pristine
|
|
rm -fr .dotest
|