* Signed tags in octopus merge..
@ 2012-01-14 21:30 Linus Torvalds
2012-01-15 2:30 ` Junio C Hamano
2012-01-16 22:49 ` Junio C Hamano
0 siblings, 2 replies; 6+ messages in thread
From: Linus Torvalds @ 2012-01-14 21:30 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
Just a heads-up and congrats: octopus merges of signed tags work well,
and did exactly the RightThing(tm), both at merge time and with
"--show-signature".
I knew it was supposed to work, but I have to admit that I was a bit
apprehensive about it when I tried.
Current top-of-head (commit 81d48f0aee54) in the kernel, in case you care.
Good job,
Linus
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Signed tags in octopus merge..
2012-01-14 21:30 Signed tags in octopus merge Linus Torvalds
@ 2012-01-15 2:30 ` Junio C Hamano
2012-01-16 22:49 ` Junio C Hamano
1 sibling, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2012-01-15 2:30 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Git Mailing List
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Just a heads-up and congrats: octopus merges of signed tags work well,
> and did exactly the RightThing(tm), both at merge time and with
> "--show-signature".
Heh, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Signed tags in octopus merge..
2012-01-14 21:30 Signed tags in octopus merge Linus Torvalds
2012-01-15 2:30 ` Junio C Hamano
@ 2012-01-16 22:49 ` Junio C Hamano
2012-01-16 22:58 ` Jacob Helwig
1 sibling, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2012-01-16 22:49 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Git Mailing List
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Just a heads-up and congrats: octopus merges of signed tags work well,
> and did exactly the RightThing(tm), both at merge time and with
> "--show-signature".
>
> I knew it was supposed to work, but I have to admit that I was a bit
> apprehensive about it when I tried.
>
> Current top-of-head (commit 81d48f0aee54) in the kernel, in case you care.
I looked at it again, and it makes me wonder if we should further reword
it to say "side branch #1, tagged 'devicetree-for-linus'" instead of the
current "parent #2, tagged 'devicetree-for-linus'". It looks very weird to
start counting from #2, when we know we will never show #1 there.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Signed tags in octopus merge..
2012-01-16 22:49 ` Junio C Hamano
@ 2012-01-16 22:58 ` Jacob Helwig
2012-01-16 23:06 ` Linus Torvalds
0 siblings, 1 reply; 6+ messages in thread
From: Jacob Helwig @ 2012-01-16 22:58 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Linus Torvalds, Git Mailing List
On Mon, Jan 16, 2012 at 2:49 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Linus Torvalds <torvalds@linux-foundation.org> writes:
>
>> Just a heads-up and congrats: octopus merges of signed tags work well,
>> and did exactly the RightThing(tm), both at merge time and with
>> "--show-signature".
>>
>> I knew it was supposed to work, but I have to admit that I was a bit
>> apprehensive about it when I tried.
>>
>> Current top-of-head (commit 81d48f0aee54) in the kernel, in case you care.
>
> I looked at it again, and it makes me wonder if we should further reword
> it to say "side branch #1, tagged 'devicetree-for-linus'" instead of the
> current "parent #2, tagged 'devicetree-for-linus'". It looks very weird to
> start counting from #2, when we know we will never show #1 there.
>
My immediate thought regarding the "side branch #1" version is not
wanting to have to do the math (even though it's a simple n+1), if I
decide to convert that text into ^ parent selection notation.
--
Jacob Helwig
http://technosorcery.net/about/me
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Signed tags in octopus merge..
2012-01-16 22:58 ` Jacob Helwig
@ 2012-01-16 23:06 ` Linus Torvalds
2012-01-17 3:31 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Linus Torvalds @ 2012-01-16 23:06 UTC (permalink / raw)
To: Jacob Helwig; +Cc: Junio C Hamano, Git Mailing List
On Mon, Jan 16, 2012 at 2:58 PM, Jacob Helwig <jacob@technosorcery.net> wrote:
>
> My immediate thought regarding the "side branch #1" version is not
> wanting to have to do the math (even though it's a simple n+1)
"Math is hard, let's go shopping".
But I think even barbie could do the "add one" thing. That said, I
think the current thing is already more than good enough, and I don't
think it's at all confusing to talk about "parent #2". In fact, I
think it's more obvious than "side branch #1".
Linus
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Signed tags in octopus merge..
2012-01-16 23:06 ` Linus Torvalds
@ 2012-01-17 3:31 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2012-01-17 3:31 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Jacob Helwig, Git Mailing List
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Mon, Jan 16, 2012 at 2:58 PM, Jacob Helwig <jacob@technosorcery.net> wrote:
>>
>> My immediate thought regarding the "side branch #1" version is not
>> wanting to have to do the math (even though it's a simple n+1)
>
> "Math is hard, let's go shopping".
>
> But I think even barbie could do the "add one" thing. That said, I
> think the current thing is already more than good enough, and I don't
> think it's at all confusing to talk about "parent #2". In fact, I
> think it's more obvious than "side branch #1".
I think Jacob is correct to point out that mice are even dumber than
Barbie and cannot do the "add one" thing, so let's leave the output as is.
Thanks for an amusing response.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-01-17 3:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-14 21:30 Signed tags in octopus merge Linus Torvalds
2012-01-15 2:30 ` Junio C Hamano
2012-01-16 22:49 ` Junio C Hamano
2012-01-16 22:58 ` Jacob Helwig
2012-01-16 23:06 ` Linus Torvalds
2012-01-17 3:31 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).