diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-09-05 22:07:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-07 21:59:42 +0200 |
| commit | 7eda0e4fbbc243d4103cced29357bb08af36a139 (patch) | |
| tree | 6b86ae90334c18217d39aa4a0b9efa1fb092918a /builtin/cat-file.c | |
| parent | builtin: convert textconv_object to use struct object_id (diff) | |
| download | git-7eda0e4fbbc243d4103cced29357bb08af36a139.tar.xz git-7eda0e4fbbc243d4103cced29357bb08af36a139.zip | |
streaming: make stream_blob_to_fd take struct object_id
Since all of its callers have been updated, modify stream_blob_to_fd to
take a struct object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/cat-file.c')
| -rw-r--r-- | builtin/cat-file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 7b2e053710..49b8fa8e22 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -83,7 +83,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, } if (type == OBJ_BLOB) - return stream_blob_to_fd(1, oid.hash, NULL, 0); + return stream_blob_to_fd(1, &oid, NULL, 0); buf = read_sha1_file(oid.hash, &type, &size); if (!buf) die("Cannot read object %s", obj_name); @@ -105,7 +105,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, oidcpy(&blob_oid, &oid); if (sha1_object_info(blob_oid.hash, NULL) == OBJ_BLOB) - return stream_blob_to_fd(1, blob_oid.hash, NULL, 0); + return stream_blob_to_fd(1, &blob_oid, NULL, 0); /* * we attempted to dereference a tag to a blob * and failed; there may be new dereference @@ -240,7 +240,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d if (data->type == OBJ_BLOB) { if (opt->buffer_output) fflush(stdout); - if (stream_blob_to_fd(1, oid->hash, NULL, 0) < 0) + if (stream_blob_to_fd(1, oid, NULL, 0) < 0) die("unable to stream %s to stdout", oid_to_hex(oid)); } else { |