applypatch: use the new git-apply to apply patches
Let's test it with some real-world horror schenarios. I'm crazy, I know.
This commit is contained in:
parent
aff9f97a4f
commit
97b865ba79
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user