feat: announce the wiggling

fix: please show more info when patch doesn't apply
2022-07-25 07:43:52 +02:00 · 2022-07-25 07:42:34 +02:00
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -38,9 +38,10 @@ 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}"
+        echo "[*] trying to wiggle $target"
        wiggle --merge --replace "$target" "$reject" || {
          echo "[!] could not merge $target, fix manually"
        }
Author	SHA1	Message	Date
ptrcnull	d1ccf0e1d4	feat: announce the wiggling	2022-07-25 07:43:52 +02:00
ptrcnull	fbaf178502	fix: please show more info when patch doesn't apply	2022-07-25 07:42:34 +02:00