From fbaf178502f4bca52165a3b30064c5f102834c46 Mon Sep 17 00:00:00 2001 From: ptrcnull Date: Mon, 25 Jul 2022 07:42:34 +0200 Subject: [PATCH] fix: please show more info when patch doesn't apply --- apatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apatch b/apatch index 7814d16..5cf8989 100755 --- a/apatch +++ b/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" || {