[PATCH] dim: make apply-patch fail again
Daniel Vetter
daniel.vetter at ffwll.ch
Wed Oct 17 06:57:49 UTC 2018
Somewhere since I originally typed this and today git apply-mbox lost
the error status for "this patch didn't apply cleanly". So instead of
exiting, we happily continue on and add Link: tags and other nonsense
to the current patch, instead of the one that we wanted to apply.
Fix this.
Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
dim | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dim b/dim
index af092e50bb08..915de89d48b7 100755
--- a/dim
+++ b/dim
@@ -926,6 +926,10 @@ function apply_patch #patch_file
git am --scissors -3 $sob "$@" $patch
+ if [ -d "$(git_dir)/rebase-apply" ] ; then
+ warn_or_fail "git apply-mbox failed"
+ fi
+
if [ -n "$message_id" ]; then
dim_commit_add_tag "Link: https://patchwork.freedesktop.org/patch/msgid/$message_id"
else
--
2.19.1
More information about the dim-tools
mailing list