From: John Keeping <john@keeping.me.uk>
Date: Wed, 27 Mar 2013 15:58:50 +0000 (+0000)
Subject: merge-tree: fix typo in merge-tree.c::unresolved
X-Git-Tag: v1.8.1.6~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=187c00c6c58ba8916a37011b56cb0cb8f2dd1805;p=git

merge-tree: fix typo in merge-tree.c::unresolved

When calculating whether there is a d/f conflict, the calculation of
whether both sides are directories generates an incorrect references
mask because it does not use the loop index to set the correct bit.
Fix this typo.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index e0d0b7d28b..bc912e399e 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -245,7 +245,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
 	unsigned dirmask = 0, mask = 0;
 
 	for (i = 0; i < 3; i++) {
-		mask |= (1 << 1);
+		mask |= (1 << i);
 		if (n[i].mode && S_ISDIR(n[i].mode))
 			dirmask |= (1 << i);
 	}