# Signed tags in octopus merge.. 6 messages from 2012-01-14 to 2012-01-17. Participants: Linus Torvalds, Junio C Hamano, Jacob Helwig. Thread: https://gitlist.dev/t/29369 ## Linus Torvalds, 2012-01-14 21:30 Subject: Signed tags in octopus merge.. Message-ID: URL: https://gitlist.dev/e/CA%2B55aFzRN2F5PZDZPRmbj9occZwA6E6Pi%2BS%2BM_Qq2EfS6sctyA%40mail.gmail.com ``` 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 ``` ## Junio C Hamano, 2012-01-15 02:30 Subject: Re: Signed tags in octopus merge.. Message-ID: <7vobu5wvda.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vobu5wvda.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Linus Torvalds 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. ``` ## Junio C Hamano, 2012-01-16 22:49 Subject: Re: Signed tags in octopus merge.. Message-ID: <7vobu3uusw.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vobu3uusw.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Linus Torvalds 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. ``` ## Jacob Helwig, 2012-01-16 22:58 Subject: Re: Signed tags in octopus merge.. Message-ID: URL: https://gitlist.dev/e/CAJ8aY1Hi47uyYSjAmtXfDEqgyc8T21WqXdEA0kGS7SQKxQ5b5g%40mail.gmail.com In-Reply-To: <7vobu3uusw.fsf@alter.siamese.dyndns.org> ``` On Mon, Jan 16, 2012 at 2:49 PM, Junio C Hamano wrote: > Linus Torvalds 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 ``` ## Linus Torvalds, 2012-01-16 23:06 Subject: Re: Signed tags in octopus merge.. Message-ID: URL: https://gitlist.dev/e/CA%2B55aFzZXSCt1AwOotMZJ%2BGcNcJKL2OcsPOtaZ3%3DcvraJ%3DPD%2BQ%40mail.gmail.com In-Reply-To: ``` On Mon, Jan 16, 2012 at 2:58 PM, Jacob Helwig 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 ``` ## Junio C Hamano, 2012-01-17 03:31 Subject: Re: Signed tags in octopus merge.. Message-ID: <7vfwfft37c.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vfwfft37c.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Linus Torvalds writes: > On Mon, Jan 16, 2012 at 2:58 PM, Jacob Helwig 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. ```