On 14 May 2018 at 16:21, Dave Airlie <[email protected]> wrote: > On 14 May 2018 at 16:13, Daniel Vetter <[email protected]> wrote: >> On Mon, May 14, 2018 at 7:18 AM, Dave Airlie <[email protected]> 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: > > I've ran update-branches and am currently using > 3f56245f179352790620c92be996c165528a4b38 > dim: store Link: in MERGE_MSG in apply-pull > >> >> 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. > > After it complains the link is missing have a look at git log
Okay looks like -d is broken then. I ran it normally, got a the warning, decided to do try -d. Indeed it works with -f. Dave. _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
