From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 5 Jun 2005 21:09:03 +0000 (-0700)
Subject: applypatch: use the new git-apply to apply patches
X-Git-Tag: v0.99.2~51^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97b865ba7954046072900a95571a308307ed8a00;p=git.git

applypatch: use the new git-apply to apply patches

Let's test it with some real-world horror schenarios.

I'm crazy, I know.
---

diff --git a/applypatch b/applypatch
index 9c191ae74..6db358877 100755
--- a/applypatch
+++ b/applypatch
@@ -58,10 +58,7 @@ echo
 echo Applying "'$SUBJECT'"
 echo
 
-git-check-files $(cat $FILES) || exit 1
-git-checkout-cache -q $(cat $FILES) || 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
+git-apply $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