From: Linus Torvalds <torvalds@linux-foundation.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Perrin Meyer <perrinmeyer@yahoo.com>, git@vger.kernel.org
Subject: Re: [PATCH] Fix read-tree merging more than 3 trees using 3-way merge
Date: Thu, 16 Aug 2007 19:32:34 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.0.999.0708161930100.30176@woody.linux-foundation.org> (raw)
In-Reply-To: <7vbqd6j4a0.fsf@gitster.siamese.dyndns.org>
On Thu, 16 Aug 2007, Junio C Hamano wrote:
>
> Linus Torvalds <torvalds@linux-foundation.org> writes:
> >
> > Sorry. I didn't even realize people did this. Oops.
>
> This is no big deal. It would have triggered if you are using
> resolve strategy _and_ did a multi merge-base merge, the former
> of which is quite unusual these days.
Yeah, ok. I see what's up.
Anyway, it sounds like we should just increase MAX_TREES to get the old
behaviour (and that requires applying my trivial one-liner patch too,
otherwise "git read-tree" will refuse to do more than 4 trees anyway).
Even if nothing apparently actually does it.
The alternative, I think, would be to just say that the three-way merge is
really just three ways, and remove the test that tests four different
trees. That would allow simplifying the logic in unpack_trees(). But since
the logic already exists, there's no real upside.
Linus
next prev parent reply other threads:[~2007-08-17 2:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-15 21:19 1.5.3-rc5 regression on OS X? Perrin Meyer
2007-08-15 21:33 ` Junio C Hamano
2007-08-15 21:43 ` Brian Gernhardt
2007-08-15 22:14 ` Randal L. Schwartz
2007-08-15 22:42 ` Junio C Hamano
2007-08-15 22:46 ` [PATCH] Fix read-tree merging more than 3 trees using 3-way merge Junio C Hamano
2007-08-17 0:59 ` Linus Torvalds
2007-08-17 2:14 ` Junio C Hamano
2007-08-17 2:32 ` Linus Torvalds [this message]
2007-08-17 3:38 ` Junio C Hamano
2007-08-17 3:44 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.0.999.0708161930100.30176@woody.linux-foundation.org \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=perrinmeyer@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).