subtree: improve decision on merges kept in split

diff --git a/bundle.c b/bundle.c
index 0a9f4ee76b2efdef259b18776a0fd6c37feab6c4..14f2cfc24836b4a526df935e83d8e5899055f483 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -369,13 +369,14 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
                 * commit that is referenced by the tag, and not the tag
                 * itself.
                 */
-               if (oidcmp(&oid, &e->item->oid)) {
+               if (!oideq(&oid, &e->item->oid)) {
                        /*
                         * Is this the positive end of a range expressed
                         * in terms of a tag (e.g. v2.0 from the range
                         * "v1.0..v2.0")?
                         */
-                       struct commit *one = lookup_commit_reference(&oid);
+                       struct commit *one = lookup_commit_reference(the_repository,
+                                                                    &oid);
                        struct object *obj;
 
                        if (e->item == &(one->object)) {