Re: [RFC/PATCH 3/4] Head reduction before selecting merge strategy

From: Jakub Narebski <jnareb@gmail.com>
Date: Mar 26, 2008, 12:50 UTC
Message-ID: <m3k5jpved8.fsf@localhost.localdomain>
In-Reply-To: <402c10cd0803252058k2f35b33fr99ec7446235eeb6e@mail.gmail.com>

"Sverre Hvammen Johansen" <hvammen@gmail.com> writes:

> See the documentation for an explanation of this feature.

That's good that the feature is documented. But I'd like to see 1.)
why this feature is implemented, and perhaps also 2.) how this feature
is implemented (for example: uses find_real_parents() function.

Show 7 quoted lines

> +If more than one commit are specified for the merge, git will try to
> +reduce the number of commits (real parents) by eliminating commits
> +than can be reached from other commits.  The commit message will
> +reflect the actual commits specified but the merge strategy will be
> +selected based on the real parents, but always including `HEAD`.  The
> +real parents (only including `HEAD` if it is real) are the parents
> +recorded in the merge commit object.

By "real" you mean "reduced" set of commits to merge? This is not clear enough, IMHO.

You would have to defend that recording reduced set of parents is a good idea (is it always done, or does --ff=never has side-effect of recording _specified_ parents for a merge?).

-- 
Jakub Narebski
Poland
ShadeHawk on #git