On Fri, 04 May 2018, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: > Looks funny, but let's allow it to be overriden. Also move it > up before we commit to the merge. > > Cc: Dave Airlie <airl...@gmail.com> > Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch> > --- > dim | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/dim b/dim > index 518043c9058d..26da35b55c32 100755 > --- a/dim > +++ b/dim > @@ -914,6 +914,11 @@ function dim_apply_pull > return 1 > fi > > + message_id=$(message_get_id $file)
This duplicates the $file parsing for message-id. BR, Jani. > + 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 > @@ -936,9 +941,6 @@ function dim_apply_pull > 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 -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
