cvs2git: escape <<EOF messages, and work around cvsps branch handling

diff --git a/applypatch b/applypatch
index 500720171f0ba29b9e34e2a7049969e00a3cc254..9c191ae746621b5a2a0387516f0ba7c4525df87b 100755 (executable)
--- a/applypatch
+++ b/applypatch
@@ -24,9 +24,9 @@ INFO=$4
 EDIT=${VISUAL:-$EDITOR}
 EDIT=${EDIT:-vi}
 
-export AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' .dotest/info)"
-export AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' .dotest/info)"
-export AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' .dotest/info)"
+export GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' .dotest/info)"
+export GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' .dotest/info)"
+export GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' .dotest/info)"
 export SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' .dotest/info)"
 
 if [ -n "$signoff" -a -f "$signoff" ]; then
@@ -60,7 +60,7 @@ echo
 
 git-check-files $(cat $FILES) || exit 1
 git-checkout-cache -q $(cat $FILES) || exit 1
-patch -u --no-backup-if-mismatch -f -p1 --fuzz=0 --input=$PATCHFILE || exit 1
+patch -E -u --no-backup-if-mismatch -f -p1 --fuzz=0 --input=$PATCHFILE || exit 1
 git-update-cache --add --remove $(cat $FILES) || exit 1
 tree=$(git-write-tree) || exit 1
 echo Wrote tree $tree