From 97b865ba7954046072900a95571a308307ed8a00 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 5 Jun 2005 14:09:03 -0700 Subject: [PATCH] applypatch: use the new git-apply to apply patches Let's test it with some real-world horror schenarios. I'm crazy, I know. --- applypatch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 -- 2.26.2