summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-06 04:06:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-09 08:43:47 (GMT)
commit91e4f03604bd089e09154e95294d5d08c805ea49 (patch)
tree4e558499cc4f26afc480983d28e9a1401fac818e /merge-tree.c
parent5803c6f8a2faf8cfbbd046d9ebd682b82bb2b086 (diff)
downloadgit-91e4f03604bd089e09154e95294d5d08c805ea49.zip
git-91e4f03604bd089e09154e95294d5d08c805ea49.tar.gz
git-91e4f03604bd089e09154e95294d5d08c805ea49.tar.bz2
Make 'traverse_trees()' traverse conflicting DF entries in parallel
This makes the traverse_trees() entry comparator routine use the more relaxed form of name comparison that considers files and directories with the same name identical. We pass in a separate mask for just the directory entries, so that the callback routine can decide (if it wants to) to only handle one or the other type, but generally most (all?) users are expected to really want to see the case of a name 'foo' showing up in one tree as a file and in another as a directory at the same time. In particular, moving 'unpack_trees()' over to use this tree traversal mechanism requires this. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
-rw-r--r--merge-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c
index 8be0b9f..02fc10f 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -287,7 +287,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
* The successful merge rules are the same as for the three-way merge
* in git-read-tree.
*/
-static int threeway_callback(int n, unsigned long mask, struct name_entry *entry, struct traverse_info *info)
+static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *info)
{
/* Same in both? */
if (same_entry(entry+1, entry+2)) {