projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c9049d4
)
Make "applypatch" use the "-E" flag to patch.
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 18 May 2005 00:15:56 +0000
(17:15 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 18 May 2005 00:15:56 +0000
(17:15 -0700)
Always remove empty files, regardless of how the diff
showed them to have become empty.
applypatch
patch
|
blob
|
history
diff --git
a/applypatch
b/applypatch
index 160931d74a4454d406aaf24a454c7bded82c732a..9c191ae746621b5a2a0387516f0ba7c4525df87b 100755
(executable)
--- a/
applypatch
+++ b/
applypatch
@@
-60,7
+60,7
@@
echo
git-check-files $(cat $FILES) || exit 1
git-checkout-cache -q $(cat $FILES) || exit 1
-patch -u --no-backup-if-mismatch -f -p1 --fuzz=0 --input=$PATCHFILE || 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
tree=$(git-write-tree) || exit 1
echo Wrote tree $tree