From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 6 Jun 2005 06:38:18 +0000 (-0700)
Subject: Fix off-by-one in new three-way-merge updates
X-Git-Tag: v0.99~342
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d925ffbd064802bc8a6ab0bccf0c43b00a7fe710;p=git.git

Fix off-by-one in new three-way-merge updates

That's the final one ("Yeah, sure, we believe you").

Anyway, at least the tests pass, which is not saying a lot, since they
don't end up testing all the new the things that the new merge world
order tries to do. But hopefully we're now at least not any worse off
than we were before the rewrite.
---

diff --git a/read-tree.c b/read-tree.c
index b72ee1c54..90c0ee522 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -146,7 +146,7 @@ static void trivially_merge_cache(struct cache_entry **src, int nr)
 		}
 		if (old && !path_matches(old, ce))
 			reject_merge(old);
-		if (nr > 2 && (result = merge_entries(ce, src[0], src[1])) != NULL) {
+		if (nr > 1 && (result = merge_entries(ce, src[0], src[1])) != NULL) {
 			result->ce_flags |= htons(CE_UPDATE);
 			/*
 			 * See if we can re-use the old CE directly?