diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-03-26 16:01:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 09:59:34 -0700 |
| commit | ee3051bd2307cdc0145aa9ed9dcacb8acfc08c40 (patch) | |
| tree | 34c83024d11dbd1de894fc8d1e92a9714b30c463 /builtin/receive-pack.c | |
| parent | f9b11147e00f066d24d9eaf9783beaa173fdd5e0 (diff) | |
| download | git-ee3051bd2307cdc0145aa9ed9dcacb8acfc08c40.tar.gz git-ee3051bd2307cdc0145aa9ed9dcacb8acfc08c40.tar.xz | |
sha1-array: convert internal storage for struct sha1_array to object_id
Make the internal storage for struct sha1_array use an array of struct
object_id internally. Update the users of this struct which inspect its
internals.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/receive-pack.c')
| -rw-r--r-- | builtin/receive-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 62b7c5e25..d6097ee08 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -842,7 +842,7 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si) if (si->used_shallow[i] && (si->used_shallow[i][cmd->index / 32] & mask) && !delayed_reachability_test(si, i)) - sha1_array_append(&extra, si->shallow->sha1[i]); + sha1_array_append(&extra, si->shallow->oid[i].hash); opt.env = tmp_objdir_env(tmp_objdir); setup_alternate_shallow(&shallow_lock, &opt.shallow_file, &extra); @@ -859,7 +859,7 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si) * not lose these new roots.. */ for (i = 0; i < extra.nr; i++) - register_shallow(extra.sha1[i]); + register_shallow(extra.oid[i].hash); si->shallow_ref[cmd->index] = 0; sha1_array_clear(&extra); |