summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-05-06 22:18:25 -0700
committerJunio C Hamano <gitster@pobox.com>2013-05-06 22:18:25 -0700
commit423ecb0bb66e9d60b6667aebc2844e82205369a1 (patch)
treed7cb4f8790f1258eb4495cfae39b74e9d4fd7bcd /builtin
parentbba536718381705507ecc4f944c340312f93e739 (diff)
parent94883b4302118fe6ea50028d02bb453c9af38b66 (diff)
downloadgit-423ecb0bb66e9d60b6667aebc2844e82205369a1.tar.gz
Merge branch 'jk/merge-tree-added-identically'
* jk/merge-tree-added-identically: merge-tree: handle directory/empty conflict correctly
Diffstat (limited to 'builtin')
-rw-r--r--builtin/merge-tree.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index ec49917a36..61cbde4094 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -251,7 +251,11 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
for (i = 0; i < 3; i++) {
mask |= (1 << i);
- if (n[i].mode && S_ISDIR(n[i].mode))
+ /*
+ * Treat missing entries as directories so that we return
+ * after unresolved_directory has handled this.
+ */
+ if (!n[i].mode || S_ISDIR(n[i].mode))
dirmask |= (1 << i);
}