Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> writes: > On Tue, Sep 09, 2008 at 10:34:42AM -0700, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> I think some changes went into 1.6.0 around this area to (r)eject parents >> that are redundant. > > Yes, it was your 98cf9c3 (Introduce reduce_heads(), 2008-06-27). That does not necessarily mean git-merge (or git-merge-octopus) uses that C function when coming up with the set of commits to record as parents. As to what the correct behaviour is, I personally do not have a strong preference either way. - If you specify a fast-foward on the command line to merge into your HEAD, that is your choice and you may deserve the extra parent, even if it is redundant. - On the other hand, if you try to merge a single fast-forward, we do not even create a merge commit, so in the same spirit it may be better if we dropped the original HEAD from the merged result (i.e. Russell's "cleanly merged" case). I dunno. -- 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
