fix: please show more info when patch doesn't apply
This commit is contained in:
parent
42e63a4a56
commit
fbaf178502
1 changed files with 1 additions and 1 deletions
2
apatch
2
apatch
|
@ -38,7 +38,7 @@ done
|
|||
|
||||
# if file exists, try to apply
|
||||
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
|
||||
target="${reject%.rej}"
|
||||
wiggle --merge --replace "$target" "$reject" || {
|
||||
|
|
Loading…
Reference in a new issue