Merged repo for protocol headers? Why are they split?

Daniel Martin consume.noise at gmail.com
Wed Nov 29 14:44:53 UTC 2017


On 29 November 2017 at 15:01, Daniel Stone <daniel at fooishbar.org> wrote:
> Hi,
>
> On 28 November 2017 at 12:38, Daniel Martin <consume.noise at gmail.com> wrote:
>> On 27 November 2017 at 23:18, Peter Hutterer <peter.hutterer at who-t.net> wrote:
>>> have you looked at subtree merges? Keeps the repo history for each merged
>>> repository and the one from the top-level repository. And it forces you to
>>> merge into a directory anyway, so that's a win right there.
>>
>> Oh? No, didn't knew that before. But, tested it:
>> $ git remote add -f randrproto
>> git://anongit.freedesktop.org/xorg/proto/randrproto
>> $ git subtree add --prefix=randrproto/ randrproto master
>>
>> The history in the toplevel looks good. But, log -p shows the original
>> paths in the commits. Okay, it doesn't rewrite history. I can deal
>> with that.
>> Though,
>> $ git log (--graph) randrproto/randr.h
>> just shows one commit from the subtree add.
>
> git log --follow -- randrproto/randr.h

Nope, doesn't work, even if I'm in randrproto/ and omit the path.
But, it works if I'm in the toplevel and omit the path. O.o?

Imho git-subtree is not for merging repos. It exists to source some
3rd party code into the tree, be able to update it easily and
preferably squash its history.


More information about the xorg-devel mailing list