Add "Index: " to the list of things that start a patch

diff --git a/applypatch b/applypatch
index 397e4a0e506f1c5765767057dfe506154b743b83..5a3a44b0e6a4b725bd4771d57aa9a76f100e94ed 100755 (executable)
--- a/applypatch
+++ b/applypatch
@@ -7,11 +7,10 @@
 ## The arguments are:
 ##     $1 - file with commit message
 ##     $2 - file with the actual patch
-##     $3 - file with list of filenames the patch touches
-##     $4 - "info" file with Author, email and subject
-##     $5 - optional file containing signoff to add
+##     $3 - "info" file with Author, email and subject
+##     $4 - optional file containing signoff to add
 ##
-signoff="$5"
+signoff="$4"
 final=.dotest/final-commit
 ##
 ## If this file exists, we ask before applying
@@ -19,20 +18,20 @@ final=.dotest/final-commit
 query_apply=.dotest/.query_apply
 MSGFILE=$1
 PATCHFILE=$2
-FILES=$3
-INFO=$4
+INFO=$3
 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 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
        cat $signoff >> $MSGFILE
 fi
 
-(echo "[PATCH] $SUBJECT" ; echo ; cat $MSGFILE ) > $final
+(echo "[PATCH] $SUBJECT" ; if [ -s $MSGFILE ]; then echo ; cat $MSGFILE; fi ) > $final
 
 f=0
 [ -f $query_apply ] || f=1
@@ -57,13 +56,9 @@ echo
 echo Applying "'$SUBJECT'"
 echo
 
-check-files $(cat $FILES) || exit 1
-checkout-cache -q $(cat $FILES) || exit 1
-patch -u --no-backup-if-mismatch -f -p1 --fuzz=0 --input=$PATCHFILE || exit 1
-update-cache --add --remove $(cat $FILES) || exit 1
-tree=$(write-tree) || exit 1
+git-apply --index $PATCHFILE || exit 1
+tree=$(git-write-tree) || exit 1
 echo Wrote tree $tree
-commit=$(commit-tree $tree -p $(cat .git/HEAD) < $final) || exit 1
+commit=$(git-commit-tree $tree -p $(cat .git/HEAD) < $final) || exit 1
 echo Committed: $commit
 echo $commit > .git/HEAD
-