mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Convert sha1_array_lookup to take struct object_id
Convert this function by changing the declaration and definition and applying the following semantic patch to update the callers: @@ expression E1, E2; @@ - sha1_array_lookup(E1, E2.hash) + sha1_array_lookup(E1, &E2) @@ expression E1, E2; @@ - sha1_array_lookup(E1, E2->hash) + sha1_array_lookup(E1, E2) Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4ce3621a6d
commit
5d3206d501
7
bisect.c
7
bisect.c
|
@ -499,8 +499,7 @@ struct commit_list *filter_skipped(struct commit_list *list,
|
|||
while (list) {
|
||||
struct commit_list *next = list->next;
|
||||
list->next = NULL;
|
||||
if (0 <= sha1_array_lookup(&skipped_revs,
|
||||
list->item->object.oid.hash)) {
|
||||
if (0 <= sha1_array_lookup(&skipped_revs, &list->item->object.oid)) {
|
||||
if (skipped_first && !*skipped_first)
|
||||
*skipped_first = 1;
|
||||
/* Move current to tried list */
|
||||
|
@ -790,9 +789,9 @@ static void check_merge_bases(int no_checkout)
|
|||
const struct object_id *mb = &result->item->object.oid;
|
||||
if (!oidcmp(mb, current_bad_oid)) {
|
||||
handle_bad_merge_base();
|
||||
} else if (0 <= sha1_array_lookup(&good_revs, mb->hash)) {
|
||||
} else if (0 <= sha1_array_lookup(&good_revs, mb)) {
|
||||
continue;
|
||||
} else if (0 <= sha1_array_lookup(&skipped_revs, mb->hash)) {
|
||||
} else if (0 <= sha1_array_lookup(&skipped_revs, mb)) {
|
||||
handle_skipped_merge_base(mb);
|
||||
} else {
|
||||
printf(_("Bisecting: a merge base must be tested\n"));
|
||||
|
|
|
@ -2677,7 +2677,7 @@ static int loosened_object_can_be_discarded(const struct object_id *oid,
|
|||
return 0;
|
||||
if (mtime > unpack_unreachable_expiration)
|
||||
return 0;
|
||||
if (sha1_array_lookup(&recent_objects, oid->hash) >= 0)
|
||||
if (sha1_array_lookup(&recent_objects, oid) >= 0)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
|
2
fsck.c
2
fsck.c
|
@ -280,7 +280,7 @@ static int report(struct fsck_options *options, struct object *object,
|
|||
return 0;
|
||||
|
||||
if (options->skiplist && object &&
|
||||
sha1_array_lookup(options->skiplist, object->oid.hash) >= 0)
|
||||
sha1_array_lookup(options->skiplist, &object->oid) >= 0)
|
||||
return 0;
|
||||
|
||||
if (msg_type == FSCK_FATAL)
|
||||
|
|
|
@ -1684,14 +1684,14 @@ static const struct object_id *match_points_at(struct sha1_array *points_at,
|
|||
const struct object_id *tagged_oid = NULL;
|
||||
struct object *obj;
|
||||
|
||||
if (sha1_array_lookup(points_at, oid->hash) >= 0)
|
||||
if (sha1_array_lookup(points_at, oid) >= 0)
|
||||
return oid;
|
||||
obj = parse_object(oid->hash);
|
||||
if (!obj)
|
||||
die(_("malformed object at '%s'"), refname);
|
||||
if (obj->type == OBJ_TAG)
|
||||
tagged_oid = &((struct tag *)obj)->tagged->oid;
|
||||
if (tagged_oid && sha1_array_lookup(points_at, tagged_oid->hash) >= 0)
|
||||
if (tagged_oid && sha1_array_lookup(points_at, tagged_oid) >= 0)
|
||||
return tagged_oid;
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -26,11 +26,11 @@ static const unsigned char *sha1_access(size_t index, void *table)
|
|||
return array[index].hash;
|
||||
}
|
||||
|
||||
int sha1_array_lookup(struct sha1_array *array, const unsigned char *sha1)
|
||||
int sha1_array_lookup(struct sha1_array *array, const struct object_id *oid)
|
||||
{
|
||||
if (!array->sorted)
|
||||
sha1_array_sort(array);
|
||||
return sha1_pos(sha1, array->oid, array->nr, sha1_access);
|
||||
return sha1_pos(oid->hash, array->oid, array->nr, sha1_access);
|
||||
}
|
||||
|
||||
void sha1_array_clear(struct sha1_array *array)
|
||||
|
|
|
@ -11,7 +11,7 @@ struct sha1_array {
|
|||
#define SHA1_ARRAY_INIT { NULL, 0, 0, 0 }
|
||||
|
||||
void sha1_array_append(struct sha1_array *array, const struct object_id *oid);
|
||||
int sha1_array_lookup(struct sha1_array *array, const unsigned char *sha1);
|
||||
int sha1_array_lookup(struct sha1_array *array, const struct object_id *oid);
|
||||
void sha1_array_clear(struct sha1_array *array);
|
||||
|
||||
typedef int (*for_each_sha1_fn)(const unsigned char sha1[20],
|
||||
|
|
|
@ -23,7 +23,7 @@ int cmd_main(int argc, const char **argv)
|
|||
} else if (skip_prefix(line.buf, "lookup ", &arg)) {
|
||||
if (get_oid_hex(arg, &oid))
|
||||
die("not a hexadecimal SHA1: %s", arg);
|
||||
printf("%d\n", sha1_array_lookup(&array, oid.hash));
|
||||
printf("%d\n", sha1_array_lookup(&array, &oid));
|
||||
} else if (!strcmp(line.buf, "clear"))
|
||||
sha1_array_clear(&array);
|
||||
else if (!strcmp(line.buf, "for_each_unique"))
|
||||
|
|
Loading…
Reference in a new issue