diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:50 -0700 |
| commit | 02f0547eaaeeec3446b77a29593f9233cf94d626 (patch) | |
| tree | 286f46ad2d534800155bf94a4c2bddb455fcac35 /builtin | |
| parent | 916bc35b29af6e0f4f215dea9c84e4185de0fec4 (diff) | |
| download | git-02f0547eaaeeec3446b77a29593f9233cf94d626.tar.gz | |
sha1_file: convert read_object_with_reference to object_id
Convert read_object_with_reference to take pointers to struct object_id.
Update the internals of the function accordingly.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/cat-file.c | 2 | ||||
| -rw-r--r-- | builtin/grep.c | 4 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 27f4f235f6..4382b4447e 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -159,7 +159,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, * fall-back to the usual case. */ } - buf = read_object_with_reference(oid.hash, exp_type, &size, NULL); + buf = read_object_with_reference(&oid, exp_type, &size, NULL); break; default: diff --git a/builtin/grep.c b/builtin/grep.c index 9a0973e8f1..386a86b66e 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -452,7 +452,7 @@ static int grep_submodule(struct grep_opt *opt, struct repository *superproject, object = parse_object_or_die(oid, oid_to_hex(oid)); grep_read_lock(); - data = read_object_with_reference(object->oid.hash, tree_type, + data = read_object_with_reference(&object->oid, tree_type, &size, NULL); grep_read_unlock(); @@ -614,7 +614,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, int hit, len; grep_read_lock(); - data = read_object_with_reference(obj->oid.hash, tree_type, + data = read_object_with_reference(&obj->oid, tree_type, &size, NULL); grep_read_unlock(); diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 66bc0057fe..a0ccbf6699 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1351,7 +1351,7 @@ static void add_preferred_base(struct object_id *oid) if (window <= num_preferred_base++) return; - data = read_object_with_reference(oid->hash, tree_type, &size, tree_oid.hash); + data = read_object_with_reference(oid, tree_type, &size, &tree_oid); if (!data) return; |