odb: rename `odb_has_object()` flags

Rename `odb_has_object()` flags to be properly prefixed with the
function name.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index cd13a3a89f185176b1ffdd3e3d5b913285d9fc15..d9fbad535868bb90fba41a8c9e4e3c4381e4cade 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -161,7 +161,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
 
        case 'e':
                ret = !odb_has_object(the_repository->objects, &oid,
-                                     HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR);
+                                     ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR);
                goto cleanup;
 
        case 'w':

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 4795b2a13c30e3c1db8450db9c39fec3ffe69f2c..a22c3194670e9a67765d1ae26b423ed65db9ab41 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -946,7 +946,7 @@ static int update_local_ref(struct ref *ref,
        int fast_forward = 0;
 
        if (!odb_has_object(the_repository->objects, &ref->new_oid,
-                           HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                           ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                die(_("object %s not found"), oid_to_hex(&ref->new_oid));
 
        if (oideq(&ref->old_oid, &ref->new_oid)) {
@@ -1396,7 +1396,7 @@ static int check_exist_and_connected(struct ref *ref_map)
         */
        for (r = rm; r; r = r->next) {
                if (!odb_has_object(the_repository->objects, &r->old_oid,
-                                   HAS_OBJECT_RECHECK_PACKED))
+                                   ODB_HAS_OBJECT_RECHECK_PACKED))
                        return -1;
        }
 

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 9bab32effed7eca461559d37dd002eb5f6d83cd3..4bd0faeff1f4fce2d9bac195566f487f97808a0f 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -163,7 +163,7 @@ static int mark_object(struct object *obj, enum object_type type,
 
        if (!(obj->flags & HAS_OBJ)) {
                if (parent && !odb_has_object(the_repository->objects, &obj->oid,
-                                             HAS_OBJECT_RECHECK_PACKED)) {
+                                             ODB_HAS_OBJECT_RECHECK_PACKED)) {
                        printf_ln(_("broken link from %7s %s\n"
                                    "              to %7s %s"),
                                  printable_type(&parent->oid, parent->type),

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index d1e47279a8c7c94720d99fc85d1a2da1b0380a5b..d96d0eb8cf72a9565440c2a805ebcad05f52c671 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -891,7 +891,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
        if (startup_info->have_repository) {
                read_lock();
                collision_test_needed = odb_has_object(the_repository->objects, oid,
-                                                      HAS_OBJECT_FETCH_PROMISOR);
+                                                      ODB_HAS_OBJECT_FETCH_PROMISOR);
                read_unlock();
        }
 

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index e34edff406959a9b72d3c2eae30c6c6849c31c49..32b02238842fb85366eb9df2e98a1a970426101d 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1546,7 +1546,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 
        if (!is_null_oid(new_oid) &&
            !odb_has_object(the_repository->objects, new_oid,
-                           HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {
+                           ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {
                error("unpack should have generated %s, "
                      "but I can't find it!", oid_to_hex(new_oid));
                ret = "bad pack";

diff --git a/builtin/remote.c b/builtin/remote.c
index 0fddaa177331f649be5564536244124ceadce66c..de989ea3ba969154d1687709cf634c155fd7a859 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -473,7 +473,7 @@ static int get_push_ref_states(const struct ref *remote_refs,
                else if (is_null_oid(&ref->old_oid))
                        info->status = PUSH_STATUS_CREATE;
                else if (odb_has_object(the_repository->objects, &ref->old_oid,
-                                       HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR) &&
+                                       ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR) &&
                         ref_newer(&ref->new_oid, &ref->old_oid))
                        info->status = PUSH_STATUS_FASTFORWARD;
                else

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 5d31acea7c779a6e07b6323c542dd9ddafa198e3..d50844163269df2e4f090cd9e7bf0756ec37dc42 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -37,7 +37,7 @@ static void show_one(const struct show_one_options *opts,
        struct object_id peeled;
 
        if (!odb_has_object(the_repository->objects, ref->oid,
-                           HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                           ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                die("git show-ref: bad ref %s (%s)", ref->name,
                    oid_to_hex(ref->oid));
 

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 6fc64e9e4b8d5af9586a445198eb244afb870911..871fc8fff5028dedb38b85fd31b345c9552c579c 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -449,7 +449,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
                if (!delta_data)
                        return;
                if (odb_has_object(the_repository->objects, &base_oid,
-                                  HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                                  ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                        ; /* Ok we have this one */
                else if (resolve_against_held(nr, &base_oid,
                                              delta_data, delta_size))

diff --git a/cache-tree.c b/cache-tree.c
index 60059edfb0b6807b6fa579084624b1750168c343..fe41068c3493d150dcfda03be258ee0595d18635 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -239,7 +239,7 @@ int cache_tree_fully_valid(struct cache_tree *it)
                return 0;
        if (it->entry_count < 0 ||
            odb_has_object(the_repository->objects, &it->oid,
-                          HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                          ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                return 0;
        for (i = 0; i < it->subtree_nr; i++) {
                if (!cache_tree_fully_valid(it->down[i]->cache_tree))
@@ -292,7 +292,7 @@ static int update_one(struct cache_tree *it,
 
        if (0 <= it->entry_count &&
            odb_has_object(the_repository->objects, &it->oid,
-                          HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                          ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                return it->entry_count;
 
        /*
@@ -400,7 +400,7 @@ static int update_one(struct cache_tree *it,
                if (is_null_oid(oid) ||
                    (!ce_missing_ok &&
                     !odb_has_object(the_repository->objects, oid,
-                                    HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))) {
+                                    ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))) {
                        strbuf_release(&buffer);
                        if (expected_missing)
                                return -1;
@@ -448,7 +448,7 @@ static int update_one(struct cache_tree *it,
                struct object_id oid;
                hash_object_file(the_hash_algo, buffer.buf, buffer.len,
                                 OBJ_TREE, &oid);
-               if (odb_has_object(the_repository->objects, &oid, HAS_OBJECT_RECHECK_PACKED))
+               if (odb_has_object(the_repository->objects, &oid, ODB_HAS_OBJECT_RECHECK_PACKED))
                        oidcpy(&it->oid, &oid);
                else
                        to_invalidate = 1;

diff --git a/fetch-pack.c b/fetch-pack.c
index 6ecd468ef766a8923af879f336f282baf65a5d86..0f24722a7072a764190cf155ca94770aecdda389 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -145,7 +145,7 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
        if (commit) {
                if (mark_tags_complete_and_check_obj_db) {
                        if (!odb_has_object(the_repository->objects, oid,
-                                           HAS_OBJECT_RECHECK_PACKED))
+                                           ODB_HAS_OBJECT_RECHECK_PACKED))
                                die_in_commit_graph_only(oid);
                }
                return commit;
@@ -2013,7 +2013,7 @@ static void update_shallow(struct fetch_pack_args *args,
                struct object_id *oid = si->shallow->oid;
                for (i = 0; i < si->shallow->nr; i++)
                        if (odb_has_object(the_repository->objects, &oid[i],
-                                          HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                                          ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                                oid_array_append(&extra, &oid[i]);
                if (extra.nr) {
                        setup_alternate_shallow(&shallow_lock,

diff --git a/http-push.c b/http-push.c
index 9ae6062198e14fdd81233aa7cf269e7da9964598..06c3acbb5d9a21cfbb96e0f3660776820d3c5126 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1449,7 +1449,7 @@ static void one_remote_ref(const char *refname)
         */
        if (repo->can_update_info_refs &&
            !odb_has_object(the_repository->objects, &ref->old_oid,
-                           HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {
+                           ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {
                obj = lookup_unknown_object(the_repository, &ref->old_oid);
                fprintf(stderr, "  fetch %s for %s\n",
                        oid_to_hex(&ref->old_oid), refname);
@@ -1655,7 +1655,7 @@ static int delete_remote_branch(const char *pattern, int force)
                if (is_null_oid(&head_oid))
                        return error("Unable to resolve remote HEAD");
                if (!odb_has_object(the_repository->objects, &head_oid,
-                                   HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                                   ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                        return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", oid_to_hex(&head_oid));
 
                /* Remote branch must resolve to a known object */
@@ -1663,7 +1663,7 @@ static int delete_remote_branch(const char *pattern, int force)
                        return error("Unable to resolve remote branch %s",
                                     remote_ref->name);
                if (!odb_has_object(the_repository->objects, &remote_ref->old_oid,
-                                   HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                                   ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                        return error("Remote branch %s resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", remote_ref->name, oid_to_hex(&remote_ref->old_oid));
 
                /* Remote branch must be an ancestor of remote HEAD */
@@ -1886,7 +1886,7 @@ int cmd_main(int argc, const char **argv)
                    !is_null_oid(&ref->old_oid) &&
                    !ref->force) {
                        if (!odb_has_object(the_repository->objects, &ref->old_oid,
-                                           HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR) ||
+                                           ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR) ||
                            !ref_newer(&ref->peer_ref->new_oid,
                                       &ref->old_oid)) {
                                /*

diff --git a/http-walker.c b/http-walker.c
index e886e6486646d17d5b74f4db89b2f27c35d938c5..1b6d496548373e3b4fd129a588d0aaaec784ece9 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -139,7 +139,7 @@ static int fill_active_slot(void *data UNUSED)
                obj_req = list_entry(pos, struct object_request, node);
                if (obj_req->state == WAITING) {
                        if (odb_has_object(the_repository->objects, &obj_req->oid,
-                                          HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                                          ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                                obj_req->state = COMPLETE;
                        else {
                                start_object_request(obj_req);
@@ -495,7 +495,7 @@ static int fetch_object(struct walker *walker, const struct object_id *oid)
                return error("Couldn't find request for %s in the queue", hex);
 
        if (odb_has_object(the_repository->objects, &obj_req->oid,
-                          HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {
+                          ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {
                if (obj_req->req)
                        abort_http_object_request(&obj_req->req);
                abort_object_request(obj_req);

diff --git a/list-objects.c b/list-objects.c
index 91b23e22f71aac2320fc99dc61dd3132ecca070e..724d723c484de4f87ea4bc1d21fea4571a2fb48c 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -75,7 +75,7 @@ static void process_blob(struct traversal_context *ctx,
         */
        if (ctx->revs->exclude_promisor_objects &&
            !odb_has_object(the_repository->objects, &obj->oid,
-                           HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR) &&
+                           ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR) &&
            is_promisor_object(ctx->revs->repo, &obj->oid))
                return;
 

diff --git a/notes.c b/notes.c
index 51a7ef9f830a13a5f13d3b63b9a5603ff6e6973a..8f315e2a00d2658454309b82d4c8b8269273309b 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -796,7 +796,7 @@ static int prune_notes_helper(const struct object_id *object_oid,
        struct note_delete_list *n;
 
        if (odb_has_object(the_repository->objects, object_oid,
-                          HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                          ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                return 0; /* nothing to do for this note */
 
        /* failed to find object => prune this note */

diff --git a/object-file.c b/object-file.c
index 2146104de8cc687d870df2da18ef903aeb244995..98a4678ca4cdf2625a79022c269b956e1adf77bc 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -1378,7 +1378,7 @@ static int already_written(struct odb_transaction_files *transaction,
 {
        /* The object may already exist in the repository */
        if (odb_has_object(transaction->base.source->odb, oid,
-                          HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                          ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                return 1;
 
        /* Might want to keep the list sorted */

diff --git a/odb.c b/odb.c
index 8220661356b29bc83536a2d274eb7ae683ea748e..9b28fe25ef2b143d254171c4d11686002266a139 100644 (file)
--- a/odb.c
+++ b/odb.c
@@ -872,15 +872,15 @@ void *odb_read_object_peeled(struct object_database *odb,
 }
 
 int odb_has_object(struct object_database *odb, const struct object_id *oid,
-                  enum has_object_flags flags)
+                  enum odb_has_object_flags flags)
 {
        unsigned object_info_flags = 0;
 
        if (!startup_info->have_repository)
                return 0;
-       if (!(flags & HAS_OBJECT_RECHECK_PACKED))
+       if (!(flags & ODB_HAS_OBJECT_RECHECK_PACKED))
                object_info_flags |= OBJECT_INFO_QUICK;
-       if (!(flags & HAS_OBJECT_FETCH_PROMISOR))
+       if (!(flags & ODB_HAS_OBJECT_FETCH_PROMISOR))
                object_info_flags |= OBJECT_INFO_SKIP_FETCH_OBJECT;
 
        return odb_read_object_info_extended(odb, oid, NULL, object_info_flags) >= 0;

diff --git a/odb.h b/odb.h
index 9aadc1177a9e606822b4c87b2d40b53441a3a7e8..8d739e118b73dda0f6b00f72689c2cd050ae12a1 100644 (file)
--- a/odb.h
+++ b/odb.h
@@ -395,11 +395,11 @@ int odb_read_object_info(struct object_database *odb,
                         const struct object_id *oid,
                         unsigned long *sizep);
 
-enum has_object_flags {
+enum odb_has_object_flags {
        /* Retry packed storage after checking packed and loose storage */
-       HAS_OBJECT_RECHECK_PACKED = (1 << 0),
+       ODB_HAS_OBJECT_RECHECK_PACKED = (1 << 0),
        /* Allow fetching the object in case the repository has a promisor remote. */
-       HAS_OBJECT_FETCH_PROMISOR = (1 << 1),
+       ODB_HAS_OBJECT_FETCH_PROMISOR = (1 << 1),
 };
 
 /*
@@ -408,7 +408,7 @@ enum has_object_flags {
  */
 int odb_has_object(struct object_database *odb,
                   const struct object_id *oid,
-                  enum has_object_flags flags);
+                  enum odb_has_object_flags flags);
 
 int odb_freshen_object(struct object_database *odb,
                       const struct object_id *oid);

diff --git a/reflog.c b/reflog.c
index 1460ae9d0dd5f7be0df02027aedb1f3cec3674e6..82337078d00611671df7344531360d7d8d6a2349 100644 (file)
--- a/reflog.c
+++ b/reflog.c
@@ -168,7 +168,7 @@ static int tree_is_complete(const struct object_id *oid)
        complete = 1;
        while (tree_entry(&desc, &entry)) {
                if (!odb_has_object(the_repository->objects, &entry.oid,
-                               HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR) ||
+                               ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR) ||
                    (S_ISDIR(entry.mode) && !tree_is_complete(&entry.oid))) {
                        tree->object.flags |= INCOMPLETE;
                        complete = 0;

diff --git a/refs.c b/refs.c
index 685a0c247b571e8a13c49ec8c8312a1cf1d597b4..97cdea1f7609078b9960077bfb428c586da75fb8 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -425,7 +425,7 @@ int ref_resolves_to_object(const char *refname,
        if (flags & REF_ISBROKEN)
                return 0;
        if (!odb_has_object(repo->objects, oid,
-                           HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {
+                           ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {
                error(_("%s does not point to a valid object!"), refname);
                return 0;
        }

diff --git a/remote.c b/remote.c
index 7ca2a6501b4920587c86b70520358b55c58c6bdc..a664cd166aa3b910c239645093782f7be475282f 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1723,7 +1723,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
                if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
                        if (starts_with(ref->name, "refs/tags/"))
                                reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
-                       else if (!odb_has_object(the_repository->objects, &ref->old_oid, HAS_OBJECT_RECHECK_PACKED))
+                       else if (!odb_has_object(the_repository->objects, &ref->old_oid, ODB_HAS_OBJECT_RECHECK_PACKED))
                                reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
                        else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) ||
                                 !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1))

diff --git a/shallow.c b/shallow.c
index 7a3dd567950dea1d75738514d19e6736dfc70e69..a8ad92e303d24d705e3402612cb9dc832386c304 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -360,7 +360,7 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
                return 0;
        if (data->flags & QUICK) {
                if (!odb_has_object(the_repository->objects, &graft->oid,
-                                   HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                                   ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                        return 0;
        } else if (data->flags & SEEN_ONLY) {
                struct commit *c = lookup_commit(the_repository, &graft->oid);
@@ -528,7 +528,7 @@ void prepare_shallow_info(struct shallow_info *info, struct oid_array *sa)
        ALLOC_ARRAY(info->theirs, sa->nr);
        for (size_t i = 0; i < sa->nr; i++) {
                if (odb_has_object(the_repository->objects, sa->oid + i,
-                                  HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {
+                                  ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {
                        struct commit_graft *graft;
                        graft = lookup_commit_graft(the_repository,
                                                    &sa->oid[i]);
@@ -567,7 +567,7 @@ void remove_nonexistent_theirs_shallow(struct shallow_info *info)
                if (i != dst)
                        info->theirs[dst] = info->theirs[i];
                if (odb_has_object(the_repository->objects, oid + info->theirs[i],
-                                  HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))
+                                  ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))
                        dst++;
        }
        info->nr_theirs = dst;

diff --git a/walker.c b/walker.c
index 91332539d3a286a96e00d177ca8df65daade54d4..e98eb6da53692e6e8d56c0f32ad642d31bcad9d0 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -155,7 +155,7 @@ static int process(struct walker *walker, struct object *obj)
        obj->flags |= SEEN;
 
        if (odb_has_object(the_repository->objects, &obj->oid,
-                          HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {
+                          ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {
                /* We already have it, so we should scan it now. */
                obj->flags |= TO_SCAN;
        }