Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint

diff --git a/t/helper/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c
index 98a4891f1dc936a486075703de319affdacb1c78..6a3f88f5f5d4a8af09dca7c13da6132d66093ca2 100644 (file)
--- a/t/helper/test-dump-cache-tree.c
+++ b/t/helper/test-dump-cache-tree.c
@@ -33,7 +33,7 @@ static int dump_cache_tree(struct cache_tree *it,
        }
        else {
                dump_one(it, pfx, "");
-               if (oidcmp(&it->oid, &ref->oid) ||
+               if (!oideq(&it->oid, &ref->oid) ||
                    ref->entry_count != it->entry_count ||
                    ref->subtree_nr != it->subtree_nr) {
                        /* claims to be valid but is lying */