Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
test-reach: add rev-list tests
[gitweb.git]
/
combine-diff.c
diff --git
a/combine-diff.c
b/combine-diff.c
index de7695e72824f6f041e0979e29302ded6e50d611..0fed4ca529c7da81cde2b84bbe276e55ad87d0e4 100644
(file)
--- a/
combine-diff.c
+++ b/
combine-diff.c
@@
-1138,8
+1138,8
@@
static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
for (i = 0; i < num_parent; i++) {
int j;
for (j = 0; j < i; j++) {
- if (
!oidcmp
(&elem->parent[i].oid,
-
&elem->parent[j].oid)) {
+ if (
oideq
(&elem->parent[i].oid,
+ &elem->parent[j].oid)) {
reuse_combine_diff(sline, cnt, i, j);
break;
}