summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-03-27 15:58:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-27 17:00:50 (GMT)
commit187c00c6c58ba8916a37011b56cb0cb8f2dd1805 (patch)
treefc445362575632fc40f89893d1caacdb976f4445 /builtin/merge-tree.c
parent6bf6366cc6ac3de57ddb77e653d246aba333973d (diff)
downloadgit-187c00c6c58ba8916a37011b56cb0cb8f2dd1805.zip
git-187c00c6c58ba8916a37011b56cb0cb8f2dd1805.tar.gz
git-187c00c6c58ba8916a37011b56cb0cb8f2dd1805.tar.bz2
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>
Diffstat (limited to 'builtin/merge-tree.c')
-rw-r--r--builtin/merge-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index e0d0b7d..bc912e3 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);
}