Hi, On Tue, 10 Jun 2008, Miklos Vajna wrote: > On Mon, Jun 09, 2008 at 04:41:06PM -0700, Junio C Hamano > <gitster@xxxxxxxxx> wrote: > > > Actually a quick glance at git-merge, a rather large case...esac after > > that "show-branch --merge-base" tells me that we do not really use the > > output from that operation and instead we check if we are fast-forward > > from all the other heads by iterating over them. merge-octupos would > > accept it as the base but never looks at it. > > I may be wrong but I think it would be still nice to pass a valid base > to the backend, even if _currently_ the only octopus implementation > ignores it. > > Actually on "valid" I mean what my original get_octopus_merge_bases() > returned. :-) IMO that is one of the advantages of making git-merge a builtin: you need not work around the lack of performance of shell scripts, but you can actually compute what you need to compute. IOW I agree that we could give the proper list of merge bases to whatever octopus backend we use. And since your original implementation is correct, if not super-optimal, I would like to stick to it. Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
