mirror of
https://github.com/git/git.git
synced 2024-09-29 12:01:30 +02:00
a196d8d423
..and git-apply does a lot better job at it anyway. Also, we break the comment/diff on a line that starts with "diff -", not just on the "---" line. Especially for git diffs, we actually want that line in the diff. (We should probably also break on "Index: ..." followed by "=====")
34 lines
919 B
Bash
Executable File
34 lines
919 B
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".
|
|
##
|
|
## You give it a mbox-format collection of emails, and it will try to
|
|
## apply them to the kernel using "applypatch"
|
|
##
|
|
## dotest [ -q ] mail_archive [Signoff_file]
|
|
##
|
|
rm -rf .dotest
|
|
mkdir .dotest
|
|
case $1 in
|
|
|
|
-q) touch .dotest/.query_apply
|
|
shift;;
|
|
esac
|
|
mailsplit $1 .dotest || exit 1
|
|
for i in .dotest/*
|
|
do
|
|
mailinfo .dotest/msg .dotest/patch < $i > .dotest/info || exit 1
|
|
stripspace < .dotest/msg > .dotest/msg-clean
|
|
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
|