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

diff --git a/applypatch b/applypatch
index 6db358877377ca79187bb44e3c8331d8f65c4716..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,8 +18,7 @@ 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}
 
@@ -58,7 +56,7 @@ echo
 echo Applying "'$SUBJECT'"
 echo
 
-git-apply $PATCHFILE || exit 1
+git-apply --index $PATCHFILE || exit 1
 tree=$(git-write-tree) || exit 1
 echo Wrote tree $tree
 commit=$(git-commit-tree $tree -p $(cat .git/HEAD) < $final) || exit 1