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

diff --git a/applypatch b/applypatch
index 160931d74a4454d406aaf24a454c7bded82c732a..9c191ae746621b5a2a0387516f0ba7c4525df87b 100755 (executable)
--- a/applypatch
+++ b/applypatch
@@ -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