diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-03-31 01:39:56 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-31 08:33:55 -0700 |
| commit | 98a72ddc12e13231537150607f4a6a8ff8b43854 (patch) | |
| tree | b519703af87417aa54f59f80f1a2d6d9ff7f7a8c /fetch-pack.c | |
| parent | ee3051bd2307cdc0145aa9ed9dcacb8acfc08c40 (diff) | |
| download | git-98a72ddc12e13231537150607f4a6a8ff8b43854.tar.gz | |
Make sha1_array_append take a struct object_id *
Convert the callers to pass struct object_id by changing the function
declaration and definition and applying the following semantic patch:
@@
expression E1, E2;
@@
- sha1_array_append(E1, E2.hash)
+ sha1_array_append(E1, &E2)
@@
expression E1, E2;
@@
- sha1_array_append(E1, E2->hash)
+ sha1_array_append(E1, E2)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 543e8aa9e1..a2e2844318 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1042,7 +1042,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 (has_object_file(&oid[i])) - sha1_array_append(&extra, oid[i].hash); + sha1_array_append(&extra, &oid[i]); if (extra.nr) { setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, @@ -1060,7 +1060,7 @@ static void update_shallow(struct fetch_pack_args *args, if (!si->nr_ours && !si->nr_theirs) return; for (i = 0; i < nr_sought; i++) - sha1_array_append(&ref, sought[i]->old_oid.hash); + sha1_array_append(&ref, &sought[i]->old_oid); si->ref = &ref; if (args->update_shallow) { @@ -1078,9 +1078,9 @@ static void update_shallow(struct fetch_pack_args *args, return; } for (i = 0; i < si->nr_ours; i++) - sha1_array_append(&extra, oid[si->ours[i]].hash); + sha1_array_append(&extra, &oid[si->ours[i]]); for (i = 0; i < si->nr_theirs; i++) - sha1_array_append(&extra, oid[si->theirs[i]].hash); + sha1_array_append(&extra, &oid[si->theirs[i]]); setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, &extra); |