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

feat: announce the wiggling

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

1
apatch
View file

@ -41,6 +41,7 @@ done
git apply --reject --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}"
echo "[*] trying to wiggle $target"
wiggle --merge --replace "$target" "$reject" || { wiggle --merge --replace "$target" "$reject" || {
echo "[!] could not merge $target, fix manually" echo "[!] could not merge $target, fix manually"
} }