Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
applypatch: use the new git-apply to apply patches
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sun, 5 Jun 2005 21:09:03 +0000
(14:09 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sun, 5 Jun 2005 21:09:03 +0000
(14:09 -0700)
Let's test it with some real-world horror schenarios.
I'm crazy, I know.
applypatch
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
aff9f97
)
diff --git
a/applypatch
b/applypatch
index 9c191ae746621b5a2a0387516f0ba7c4525df87b..6db358877377ca79187bb44e3c8331d8f65c4716 100755
(executable)
--- 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