linux-kernel - Re: [git pull] drm fixes

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sat, 21 Mar 2015 10:50:55 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Dave Airlie <airlied@...ux.ie>
Cc:	DRI mailing list <dri-devel@...ts.freedesktop.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] drm fixes

On Fri, Mar 20, 2015 at 2:49 PM, Dave Airlie <airlied@...ux.ie> wrote:
>
> In other news I've some problem with my git tree and git request-pull
> [airlied@...adlord-bne-redhat-com linux]$ git request-pull linus/master origin
>
> warn: No match for commit 8265d4486d5c2448a1c645fdc20d4e62873d9c3d found at origin
> warn: Are you sure you pushed 'HEAD' there?

This generally happens if you don't have the same symbolic names
(branch or tag) locally and remotely.

If your local branch name is "linus/master", and your remote one is
just "master", then do what you would do for a "git push": tell git
with the 'local':'remote' syntax _both_ branch names. So something
like

    git request-pull linus/master:master origin

should have made request-pull understand to look for the commit at
'master' on the remote side.

That said, when you have a multi-branch setup like you do, I actually
would prefer that you *not* send me "master", but instead send me the
branch (among many) that is clearly for me. So I'd prefer "for-linus"
or similar, simply because it's clearly and explicitly directed at me
and not just some default branch.

Of course, even better would be if you used signed tags.

                              Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/