Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
convert "hashcmp() == 0" to hasheq()
[gitweb.git]
/
builtin
/
fmt-merge-msg.c
diff --git
a/builtin/fmt-merge-msg.c
b/builtin/fmt-merge-msg.c
index f35ff1612bb563c819b611e82f8e3a7730d32461..4c82c234cbf2d21c9d632f5494e8265cc351fab9 100644
(file)
--- a/
builtin/fmt-merge-msg.c
+++ b/
builtin/fmt-merge-msg.c
@@
-582,7
+582,7
@@
static void find_merge_parents(struct merge_parents *result,
while (parents) {
struct commit *cmit = pop_commit(&parents);
for (i = 0; i < result->nr; i++)
- if (
!oidcmp
(&result->item[i].commit, &cmit->object.oid))
+ if (
oideq
(&result->item[i].commit, &cmit->object.oid))
result->item[i].used = 1;
}