diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 17:15:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 17:15:56 -0700 |
| commit | 6a9853cd4587c9dd16553b429c6d4a9d8111a396 (patch) | |
| tree | 94a13e03b9e9664403fff32a32d2a6c3c22507c0 | |
| parent | c9049d41b8d91a198e4642b266e50a506024f0aa (diff) | |
| download | git-6a9853cd4587c9dd16553b429c6d4a9d8111a396.tar.gz git-6a9853cd4587c9dd16553b429c6d4a9d8111a396.tar.xz | |
Make "applypatch" use the "-E" flag to patch.
Always remove empty files, regardless of how the diff
showed them to have become empty.
| -rwxr-xr-x | applypatch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/applypatch b/applypatch index 160931d74..9c191ae74 100755 --- 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 |