mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-07-22 16:04:19 -07:00
committed by Linus Torvalds
parent d854f783af
commit 3727531899
1 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tools/applymbox
View File

@ -9,20 +9,48 @@
## You give it a mbox-format collection of emails, and it will try to ## You give it a mbox-format collection of emails, and it will try to
## apply them to the kernel using "applypatch" ## apply them to the kernel using "applypatch"
## ##
## dotest [ -q ] mail_archive [Signoff_file] ## applymbox [ -c .dotest/msg-number ] [ -q ] mail_archive [Signoff_file]"
## ##
rm -rf .dotest ## The patch application may fail in the middle. In which case:
mkdir .dotest ## (1) look at .dotest/patch and fix it up to apply
case $1 in ## (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.
-q) touch .dotest/.query_apply query_apply= continue= resume=t
shift;; while case "$#" in 0) break ;; esac
esac
mailsplit $1 .dotest || exit 1
for i in .dotest/*
do do
mailinfo .dotest/msg .dotest/patch < $i > .dotest/info || exit 1 case "$1" in
git-stripspace < .dotest/msg > .dotest/msg-clean -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" applypatch .dotest/msg-clean .dotest/patch .dotest/info "$2"
ret=$? ret=$?
if [ $ret -ne 0 ]; then if [ $ret -ne 0 ]; then