Hi Junio,
On Tue, 23 Jan 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > + /*
> > +* If HEAD is not identical to the parent of the original merge commit,
> > +* we cannot fast-forward.
> > +*/
> > + can_fast_forward = commit && commit->parents &&
> > +
Hi Phillip,
On Fri, 19 Jan 2018, Phillip Wood wrote:
> On 18/01/18 15:35, Johannes Schindelin wrote:
> >
> > Just like with regular `pick` commands, if we are trying to recreate a
> > merge commit, we now test whether the parents of said commit match HEAD
> > and the commits to be merged, and fa
Phillip Wood writes:
> I agree that the merge should be recreated, but I was thinking of
> something slightly different. Currently the sequencer uses
> opts->allow_ff to control whether a new commit with the same contents
> should be created even if the existing one could be reused.
Ahh, OK. I
On 23/01/18 19:12, Junio C Hamano wrote:
Phillip Wood writes:
On 18/01/18 15:35, Johannes Schindelin wrote:
Just like with regular `pick` commands, if we are trying to recreate a
merge commit, we now test whether the parents of said commit match HEAD
and the commits to be merged, and fast-fo
Phillip Wood writes:
> On 18/01/18 15:35, Johannes Schindelin wrote:
>>
>> Just like with regular `pick` commands, if we are trying to recreate a
>> merge commit, we now test whether the parents of said commit match HEAD
>> and the commits to be merged, and fast-forward if possible.
>>
>> This
Johannes Schindelin writes:
> + /*
> + * If HEAD is not identical to the parent of the original merge commit,
> + * we cannot fast-forward.
> + */
> + can_fast_forward = commit && commit->parents &&
> + !oidcmp(&commit->parents->item->object.oid,
> +
On 18/01/18 15:35, Johannes Schindelin wrote:
>
> Just like with regular `pick` commands, if we are trying to recreate a
> merge commit, we now test whether the parents of said commit match HEAD
> and the commits to be merged, and fast-forward if possible.
>
> This is not only faster, but also av
Just like with regular `pick` commands, if we are trying to recreate a
merge commit, we now test whether the parents of said commit match HEAD
and the commits to be merged, and fast-forward if possible.
This is not only faster, but also avoids unnecessary proliferation of
new objects.
Signed-off-
8 matches
Mail list logo
