Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sg/test-cmp-rev'
[gitweb.git]
/
match-trees.c
diff --git
a/match-trees.c
b/match-trees.c
index 37653308d3601e56191d2f83f967cc77ad1517af..2b6d31ef9d35d9422e7ef90792651dcb7a2f9189 100644
(file)
--- a/
match-trees.c
+++ b/
match-trees.c
@@
-106,7
+106,7
@@
static int score_trees(const struct object_id *hash1, const struct object_id *ha
update_tree_entry(&two);
} else {
/* path appears in both */
- if (
oidcmp
(one.entry.oid, two.entry.oid)) {
+ if (
!oideq
(one.entry.oid, two.entry.oid)) {
/* they are different */
score += score_differs(one.entry.mode,
two.entry.mode,