diff options
| -rw-r--r-- | read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-tree.c b/read-tree.c index b72ee1c54c..90c0ee522d 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? |