diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-05-04 08:34:30 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-05-07 14:56:14 +0200 |
| commit | 89b5b463a10c57190623a5858fec22716ad804fc (patch) | |
| tree | e0bfad718aa8877df8d8d08827b78707177d86c3 | |
| parent | 11d85afde8d48ee750ae124ecd6233465bbb9582 (diff) | |
dim: bail apply-pull if the msg-id isn't there
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).
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rwxr-xr-x | dim | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |