Re: git merge -s subtree seems to be broken.

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 31, 2018, 17:17 UTC
Message-ID: <xmqqh8kfcokk.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180731161559.GB16910@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 7 quoted lines

> +...
> +		} else if (cmp > 0) {
>  			/* path2 does not appear in one */
> +			score += score_missing(two.entry.mode, two.entry.path);
> +			update_tree_entry(&two);
> +			continue;
> +		} if (oidcmp(one.entry.oid, two.entry.oid)) {

As the earlier ones do the "continue at the end of the block", this does not affect the correctness, but I think you either meant "else if" or a fresh "if/else" that is disconnected from the previous if/else if/... chain.

Show 5 quoted lines

>  			/* they are different */
> ...
> +			score += score_differs(one.entry.mode, two.entry.mode,
> +					       one.entry.path);
> +		} else {