cvs2git: escape <<EOF messages, and work around cvsps branch handling
[gitweb.git] / dotest
diff --git a/dotest b/dotest
index 7d2c16b9abb9bdbeb0cb102392aa675a83f032de..ccc1f0304f10b58975705de256d8e23df82ec535 100755 (executable)
--- a/dotest
+++ b/dotest
@@ -7,11 +7,27 @@
 ## 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 .dotest/file < $i > .dotest/info || exit 1
-       applypatch .dotest/msg .dotest/patch .dotest/file .dotest/info || exit 1
+       stripspace < .dotest/msg > .dotest/msg-clean
+       applypatch .dotest/msg-clean .dotest/patch .dotest/file .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