Looks funny, but let's allow it to be overriden. Also move it
up before we commit to the merge.
v2: Remeber to remove the old message_id parsing (Jani).
Cc: Jani Nikula <jani.nik...@linux.intel.com>
Cc: Dave Airlie <airl...@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch>
---
dim | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dim b/dim
index 010dd2001254..2faaab5a966a 100755
--- a/dim
+++ b/dim
@@ -922,6 +922,11 @@ function dim_apply_pull
return 1
fi
+ message_id=$(message_get_id $file)
+ if [ -z "$message_id" ]; then
+ warn_or_fail "No message-id found in the pull request file."
+ fi
+
echo Pulling $pull_branch ...
git fetch $pull_branch
@@ -937,14 +942,9 @@ function dim_apply_pull
fi
fi
- message_id=$(message_get_id $file)
-
git commit --amend -s --no-edit
if [ -n "$message_id" ]; then
dim_commit_add_tag "Link:
https://patchwork.freedesktop.org/patch/msgid/$message_id";
- else
- echoerr "WARNING: No message-id found in the patch file."
- rv=1
fi
--
2.17.0
_______________________________________________
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
