current dim master misapplies a pull

Daniel Vetter daniel at ffwll.ch
Mon May 14 06:13:25 UTC 2018


On Mon, May 14, 2018 at 7:18 AM, Dave Airlie <airlied at gmail.com> wrote:
> Trying to apply:
> https://patchwork.freedesktop.org/patch/221740/
>
> It fails with missing link, it appears to git amend the last commit in
> my tree with the link.

Hm, I thought I've fixed that with my latest patches, at least I don't
get this here:

Pulling https://github.com/jsarha/linux tags/tilcdc-4.18 ...
remote: Counting objects: 8, done.
remote: Total 8 (delta 6), reused 6 (delta 6), pack-reused 2
Unpacking objects: 100% (8/8), done.
>From https://github.com/jsarha/linux
 * tag                         tilcdc-4.18 -> FETCH_HEAD
dim: a88ad3ded15daa0389106779c60b8a5e76d4b20a is lacking of link tag
dim: ERROR: issues in commits detected, aborting

So here dim is just complaining that the Link: tag isn't there, which
is what we're using to tie this all into patchwork. I guess dim should
detect whether the pull is for a dim-managed branch, and only check
for Link: tags in that case.

With dim -f apply-pull drm-next it all goes through smoothly.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch


More information about the dim-tools mailing list