ptrcnull/apatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: please show more info when patch doesn't apply

Browse source
This commit is contained in:
ptrcnull 2022-07-25 07:42:34 +02:00
parent 42e63a4a56
commit fbaf178502
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apatch
View file

@ -38,7 +38,7 @@ done
# if file exists, try to apply # if file exists, try to apply
if [ -e "$patchpath" ]; then if [ -e "$patchpath" ]; then
git apply --reject --quiet --whitespace=fix "$patchpath" || { git apply --reject --whitespace=fix "$patchpath" || {
git status --porcelain | grep '\?\? .*\.rej$' | cut -c4- | while read -r reject; do git status --porcelain | grep '\?\? .*\.rej$' | cut -c4- | while read -r reject; do
target="${reject%.rej}" target="${reject%.rej}"
wiggle --merge --replace "$target" "$reject" || { wiggle --merge --replace "$target" "$reject" || {