diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 14:09:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 14:09:03 -0700 |
| commit | 97b865ba7954046072900a95571a308307ed8a00 (patch) | |
| tree | c6b5d256f5580ecfbe784de62b34e83dc311e2cf | |
| parent | aff9f97a4fd98e34b0dfde06dacd9dbd82de0b58 (diff) | |
| download | git-97b865ba7954046072900a95571a308307ed8a00.tar.gz git-97b865ba7954046072900a95571a308307ed8a00.tar.xz | |
applypatch: use the new git-apply to apply patches
Let's test it with some real-world horror schenarios.
I'm crazy, I know.
| -rwxr-xr-x | applypatch | 5 |
1 files changed, 1 insertions, 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 |