c63911b052 · matheusbsbs/matheus-bagliano

builtin/cat-file.c

+1 -1

@@ -161,7 +161,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)

161

162 case 'e':

163 ret = !odb_has_object(the_repository->objects, &oid,

164 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR);

164 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR);

165 goto cleanup;

166

167 case 'w':

builtin/fetch.c

+2 -2

@@ -946,7 +946,7 @@ static int update_local_ref(struct ref *ref,

946 int fast_forward = 0;

947

948 if (!odb_has_object(the_repository->objects, &ref->new_oid,

949 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

949 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

950 die(_("object %s not found"), oid_to_hex(&ref->new_oid));

951

952 if (oideq(&ref->old_oid, &ref->new_oid)) {

@@ -1396,7 +1396,7 @@ static int check_exist_and_connected(struct ref *ref_map)

1396 */

1397 for (r = rm; r; r = r->next) {

1398 if (!odb_has_object(the_repository->objects, &r->old_oid,

1399 - HAS_OBJECT_RECHECK_PACKED))

1399 + ODB_HAS_OBJECT_RECHECK_PACKED))

1400 return -1;

1401 }

1402

builtin/fsck.c

+1 -1

@@ -163,7 +163,7 @@ static int mark_object(struct object *obj, enum object_type type,

163

164 if (!(obj->flags & HAS_OBJ)) {

165 if (parent && !odb_has_object(the_repository->objects, &obj->oid,

166 - HAS_OBJECT_RECHECK_PACKED)) {

166 + ODB_HAS_OBJECT_RECHECK_PACKED)) {

167 printf_ln(_("broken link from %7s %s\n"

168 " to %7s %s"),

169 printable_type(&parent->oid, parent->type),

builtin/index-pack.c

+1 -1

@@ -891,7 +891,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,

891 if (startup_info->have_repository) {

892 read_lock();

893 collision_test_needed = odb_has_object(the_repository->objects, oid,

894 - HAS_OBJECT_FETCH_PROMISOR);

894 + ODB_HAS_OBJECT_FETCH_PROMISOR);

895 read_unlock();

896 }

897

builtin/receive-pack.c

+1 -1

@@ -1546,7 +1546,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)

1546

1547 if (!is_null_oid(new_oid) &&

1548 !odb_has_object(the_repository->objects, new_oid,

1549 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {

1549 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {

1550 error("unpack should have generated %s, "

1551 "but I can't find it!", oid_to_hex(new_oid));

1552 ret = "bad pack";

builtin/remote.c

+1 -1

@@ -473,7 +473,7 @@ static int get_push_ref_states(const struct ref *remote_refs,

473 else if (is_null_oid(&ref->old_oid))

474 info->status = PUSH_STATUS_CREATE;

475 else if (odb_has_object(the_repository->objects, &ref->old_oid,

476 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR) &&

476 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR) &&

477 ref_newer(&ref->new_oid, &ref->old_oid))

478 info->status = PUSH_STATUS_FASTFORWARD;

479 else

builtin/show-ref.c

+1 -1

@@ -37,7 +37,7 @@ static void show_one(const struct show_one_options *opts,

37 struct object_id peeled;

38

39 if (!odb_has_object(the_repository->objects, ref->oid,

40 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

40 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

41 die("git show-ref: bad ref %s (%s)", ref->name,

42 oid_to_hex(ref->oid));

43

builtin/unpack-objects.c

+1 -1

@@ -449,7 +449,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,

449 if (!delta_data)

450 return;

451 if (odb_has_object(the_repository->objects, &base_oid,

452 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

452 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

453 ; /* Ok we have this one */

454 else if (resolve_against_held(nr, &base_oid,

455 delta_data, delta_size))

cache-tree.c

+4 -4

@@ -239,7 +239,7 @@ int cache_tree_fully_valid(struct cache_tree *it)

239 return 0;

240 if (it->entry_count < 0 ||

241 odb_has_object(the_repository->objects, &it->oid,

242 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

242 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

243 return 0;

244 for (i = 0; i < it->subtree_nr; i++) {

245 if (!cache_tree_fully_valid(it->down[i]->cache_tree))

@@ -292,7 +292,7 @@ static int update_one(struct cache_tree *it,

292

293 if (0 <= it->entry_count &&

294 odb_has_object(the_repository->objects, &it->oid,

295 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

295 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

296 return it->entry_count;

297

298 /*

@@ -400,7 +400,7 @@ static int update_one(struct cache_tree *it,

400 if (is_null_oid(oid) ||

401 (!ce_missing_ok &&

402 !odb_has_object(the_repository->objects, oid,

403 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))) {

403 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))) {

404 strbuf_release(&buffer);

405 if (expected_missing)

406 return -1;

@@ -448,7 +448,7 @@ static int update_one(struct cache_tree *it,

448 struct object_id oid;

449 hash_object_file(the_hash_algo, buffer.buf, buffer.len,

450 OBJ_TREE, &oid);

451 - if (odb_has_object(the_repository->objects, &oid, HAS_OBJECT_RECHECK_PACKED))

451 + if (odb_has_object(the_repository->objects, &oid, ODB_HAS_OBJECT_RECHECK_PACKED))

452 oidcpy(&it->oid, &oid);

453 else

454 to_invalidate = 1;

fetch-pack.c

+2 -2

@@ -145,7 +145,7 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,

145 if (commit) {

146 if (mark_tags_complete_and_check_obj_db) {

147 if (!odb_has_object(the_repository->objects, oid,

148 - HAS_OBJECT_RECHECK_PACKED))

148 + ODB_HAS_OBJECT_RECHECK_PACKED))

149 die_in_commit_graph_only(oid);

150 }

151 return commit;

@@ -2013,7 +2013,7 @@ static void update_shallow(struct fetch_pack_args *args,

2013 struct object_id *oid = si->shallow->oid;

2014 for (i = 0; i < si->shallow->nr; i++)

2015 if (odb_has_object(the_repository->objects, &oid[i],

2016 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

2016 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

2017 oid_array_append(&extra, &oid[i]);

2018 if (extra.nr) {

2019 setup_alternate_shallow(&shallow_lock,

http-push.c

+4 -4

@@ -1449,7 +1449,7 @@ static void one_remote_ref(const char *refname)

1449 */

1450 if (repo->can_update_info_refs &&

1451 !odb_has_object(the_repository->objects, &ref->old_oid,

1452 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {

1452 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {

1453 obj = lookup_unknown_object(the_repository, &ref->old_oid);

1454 fprintf(stderr, " fetch %s for %s\n",

1455 oid_to_hex(&ref->old_oid), refname);

@@ -1655,7 +1655,7 @@ static int delete_remote_branch(const char *pattern, int force)

1655 if (is_null_oid(&head_oid))

1656 return error("Unable to resolve remote HEAD");

1657 if (!odb_has_object(the_repository->objects, &head_oid,

1658 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

1658 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

1659 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", oid_to_hex(&head_oid));

1660

1661 /* Remote branch must resolve to a known object */

@@ -1663,7 +1663,7 @@ static int delete_remote_branch(const char *pattern, int force)

1663 return error("Unable to resolve remote branch %s",

1664 remote_ref->name);

1665 if (!odb_has_object(the_repository->objects, &remote_ref->old_oid,

1666 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

1666 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

1667 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));

1668

1669 /* Remote branch must be an ancestor of remote HEAD */

@@ -1886,7 +1886,7 @@ int cmd_main(int argc, const char **argv)

1886 !is_null_oid(&ref->old_oid) &&

1887 !ref->force) {

1888 if (!odb_has_object(the_repository->objects, &ref->old_oid,

1889 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR) ||

1889 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR) ||

1890 !ref_newer(&ref->peer_ref->new_oid,

1891 &ref->old_oid)) {

1892 /*

http-walker.c

+2 -2

@@ -139,7 +139,7 @@ static int fill_active_slot(void *data UNUSED)

139 obj_req = list_entry(pos, struct object_request, node);

140 if (obj_req->state == WAITING) {

141 if (odb_has_object(the_repository->objects, &obj_req->oid,

142 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

142 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

143 obj_req->state = COMPLETE;

144 else {

145 start_object_request(obj_req);

@@ -495,7 +495,7 @@ static int fetch_object(struct walker *walker, const struct object_id *oid)

495 return error("Couldn't find request for %s in the queue", hex);

496

497 if (odb_has_object(the_repository->objects, &obj_req->oid,

498 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {

498 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {

499 if (obj_req->req)

500 abort_http_object_request(&obj_req->req);

501 abort_object_request(obj_req);

list-objects.c

+1 -1

@@ -75,7 +75,7 @@ static void process_blob(struct traversal_context *ctx,

75 */

76 if (ctx->revs->exclude_promisor_objects &&

77 !odb_has_object(the_repository->objects, &obj->oid,

78 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR) &&

78 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR) &&

79 is_promisor_object(ctx->revs->repo, &obj->oid))

80 return;

81

notes.c

+1 -1

@@ -796,7 +796,7 @@ static int prune_notes_helper(const struct object_id *object_oid,

796 struct note_delete_list *n;

797

798 if (odb_has_object(the_repository->objects, object_oid,

799 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

799 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

800 return 0; /* nothing to do for this note */

801

802 /* failed to find object => prune this note */

object-file.c

+1 -1

@@ -1378,7 +1378,7 @@ static int already_written(struct odb_transaction_files *transaction,

1378 {

1379 /* The object may already exist in the repository */

1380 if (odb_has_object(transaction->base.source->odb, oid,

1381 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

1381 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

1382 return 1;

1383

1384 /* Might want to keep the list sorted */

odb.c

+3 -3

@@ -872,15 +872,15 @@ void *odb_read_object_peeled(struct object_database *odb,

872 }

873

874 int odb_has_object(struct object_database *odb, const struct object_id *oid,

875 - enum has_object_flags flags)

875 + enum odb_has_object_flags flags)

876 {

877 unsigned object_info_flags = 0;

878

879 if (!startup_info->have_repository)

880 return 0;

881 - if (!(flags & HAS_OBJECT_RECHECK_PACKED))

881 + if (!(flags & ODB_HAS_OBJECT_RECHECK_PACKED))

882 object_info_flags |= OBJECT_INFO_QUICK;

883 - if (!(flags & HAS_OBJECT_FETCH_PROMISOR))

883 + if (!(flags & ODB_HAS_OBJECT_FETCH_PROMISOR))

884 object_info_flags |= OBJECT_INFO_SKIP_FETCH_OBJECT;

885

886 return odb_read_object_info_extended(odb, oid, NULL, object_info_flags) >= 0;

odb.h

+4 -4

@@ -395,11 +395,11 @@ int odb_read_object_info(struct object_database *odb,

395 const struct object_id *oid,

396 unsigned long *sizep);

397

398 -enum has_object_flags {

398 +enum odb_has_object_flags {

399 /* Retry packed storage after checking packed and loose storage */

400 - HAS_OBJECT_RECHECK_PACKED = (1 << 0),

400 + ODB_HAS_OBJECT_RECHECK_PACKED = (1 << 0),

401 /* Allow fetching the object in case the repository has a promisor remote. */

402 - HAS_OBJECT_FETCH_PROMISOR = (1 << 1),

402 + ODB_HAS_OBJECT_FETCH_PROMISOR = (1 << 1),

403 };

404

405 /*

@@ -408,7 +408,7 @@ enum has_object_flags {

408 */

409 int odb_has_object(struct object_database *odb,

410 const struct object_id *oid,

411 - enum has_object_flags flags);

411 + enum odb_has_object_flags flags);

412

413 int odb_freshen_object(struct object_database *odb,

414 const struct object_id *oid);

reflog.c

+1 -1

@@ -168,7 +168,7 @@ static int tree_is_complete(const struct object_id *oid)

168 complete = 1;

169 while (tree_entry(&desc, &entry)) {

170 if (!odb_has_object(the_repository->objects, &entry.oid,

171 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR) ||

171 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR) ||

172 (S_ISDIR(entry.mode) && !tree_is_complete(&entry.oid))) {

173 tree->object.flags |= INCOMPLETE;

174 complete = 0;

refs.c

+1 -1

@@ -425,7 +425,7 @@ int ref_resolves_to_object(const char *refname,

425 if (flags & REF_ISBROKEN)

426 return 0;

427 if (!odb_has_object(repo->objects, oid,

428 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {

428 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {

429 error(_("%s does not point to a valid object!"), refname);

430 return 0;

431 }

remote.c

+1 -1

@@ -1723,7 +1723,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,

1723 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {

1724 if (starts_with(ref->name, "refs/tags/"))

1725 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;

1726 - else if (!odb_has_object(the_repository->objects, &ref->old_oid, HAS_OBJECT_RECHECK_PACKED))

1726 + else if (!odb_has_object(the_repository->objects, &ref->old_oid, ODB_HAS_OBJECT_RECHECK_PACKED))

1727 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;

1728 else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) ||

1729 !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1))

shallow.c

+3 -3

@@ -360,7 +360,7 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)

360 return 0;

361 if (data->flags & QUICK) {

362 if (!odb_has_object(the_repository->objects, &graft->oid,

363 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

363 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

364 return 0;

365 } else if (data->flags & SEEN_ONLY) {

366 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)

528 ALLOC_ARRAY(info->theirs, sa->nr);

529 for (size_t i = 0; i < sa->nr; i++) {

530 if (odb_has_object(the_repository->objects, sa->oid + i,

531 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {

531 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {

532 struct commit_graft *graft;

533 graft = lookup_commit_graft(the_repository,

534 &sa->oid[i]);

@@ -567,7 +567,7 @@ void remove_nonexistent_theirs_shallow(struct shallow_info *info)

567 if (i != dst)

568 info->theirs[dst] = info->theirs[i];

569 if (odb_has_object(the_repository->objects, oid + info->theirs[i],

570 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR))

570 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR))

571 dst++;

572 }

573 info->nr_theirs = dst;

walker.c

+1 -1

@@ -155,7 +155,7 @@ static int process(struct walker *walker, struct object *obj)

155 obj->flags |= SEEN;

156

157 if (odb_has_object(the_repository->objects, &obj->oid,

158 - HAS_OBJECT_RECHECK_PACKED | HAS_OBJECT_FETCH_PROMISOR)) {

158 + ODB_HAS_OBJECT_RECHECK_PACKED | ODB_HAS_OBJECT_FETCH_PROMISOR)) {

159 /* We already have it, so we should scan it now. */

160 obj->flags |= TO_SCAN;

161 }

odb: rename `odb_has_object()` flags