threads / discuss / 3225

RE: The merge from hell...

Subject: RE: The merge from hell...

## tl;dr

3 messages between Feb 3, 2006 and Feb 3, 2006.

replies: 2people: 3as markdown or json

Brown, Len· Feb 3, 2006, 06:04 UTC · lore

>The 12-way merge was a bit over the top, but it worked. I'd 
>suggest not being quite _that_ aggressive in the future,
>though, but it's not a big deal.

I favor "assertive" over "aggressive" -- I assert that the tools I use must work as advertised;-)

> #define MAXPARENT (16)

How about setting this #define to the number that you're comfortable with? Then folks like me -- who wouldn't dream of checking code into Linux with a hopped-up git -- will simply obey the limit that comes with the tool?

>One thing I'd ask for: would it be possible to have more descriptive 
>branch names than just numbers? Even if you want to track it 
>by bugzilla entry number, how about calling it "bugzilla-12345" instead?

bugzilla-#### -- no problem -- will do.

thanks, -Len

ps. In the back of my head I was worried about using plain numbers when I saw somebody refer to "shorthand SHA1". Hopefully this is an idle worry and it is not possible for the tool to confuse a numeric branch name with a SHA1 id.

Linus Torvalds· Feb 3, 2006, 06:16 UTC · re: Brown, Len · lore

On Fri, 3 Feb 2006, Brown, Len wrote:

Show 5 quoted lines

>
> In the back of my head I was worried about using plain
> numbers when I saw somebody refer to "shorthand SHA1".
> Hopefully this is an idle worry and it is not possible
> for the tool to confuse a numeric branch name with a SHA1 id.

It _is_ possible, but the rule is that references will be resolved first.

If you mis-type a reference and it could be construed as a short hex SHA1 ID (it needs to have more than 5 characters in it to trigger, though), the auto-completion of SHA1 ID's could bite you, though.

It's pretty unlikely, of course. But it's one reason to try to avoid using ref names that are numeric.

		Linus

Junio C Hamano· Feb 3, 2006, 06:33 UTC · re: Linus Torvalds · lore

Re: The merge from hell...

Linus Torvalds <torvalds@osdl.org> writes:

Show 8 quoted lines

> On Fri, 3 Feb 2006, Brown, Len wrote:
>>
>> In the back of my head I was worried about using plain
>> numbers when I saw somebody refer to "shorthand SHA1".
>> Hopefully this is an idle worry and it is not possible
>> for the tool to confuse a numeric branch name with a SHA1 id.
>
> It _is_ possible, but the rule is that references will be resolved first.

I have to admit that I had this broken for a while. The breakage was when you have the same numeric branch name _and_ tagname, then ref resolution was skipped and short SHA1 was taken. It _might_ have bitten somebody in real life until I fixed it. But I believe this is fixed now.

> It's pretty unlikely, of course. But it's one reason to try to avoid using 
> ref names that are numeric.

Or even non numeric ones, like "deadbeef".