diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-07-13 23:49:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-17 13:54:51 -0700 |
| commit | 321c89bf5fa937b19800fa97cfe93199b817d34f (patch) | |
| tree | 367e0ab590a1f182a42db30f8bd14316cef0322f /builtin/cat-file.c | |
| parent | e82caf384bb3c7f41ec5419de04e6493d7b0f4a5 (diff) | |
| download | git-321c89bf5fa937b19800fa97cfe93199b817d34f.tar.gz git-321c89bf5fa937b19800fa97cfe93199b817d34f.tar.xz | |
sha1_name: convert GET_SHA1* flags to GET_OID*
Convert the flags for get_oid_with_context and friends to use "OID"
instead of "SHA1" in their names.
This transform was made by running the following one-liner on the
affected files:
perl -pi -e 's/GET_SHA1/GET_OID/g'
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 1f035fb55..62c8cf0eb 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -63,7 +63,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, if (unknown_type) flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE; - if (get_oid_with_context(obj_name, GET_SHA1_RECORD_PATH, + if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH, &oid, &obj_context)) die("Not a valid object name %s", obj_name); @@ -361,7 +361,7 @@ static void batch_one_object(const char *obj_name, struct batch_options *opt, struct expand_data *data) { struct object_context ctx; - int flags = opt->follow_symlinks ? GET_SHA1_FOLLOW_SYMLINKS : 0; + int flags = opt->follow_symlinks ? GET_OID_FOLLOW_SYMLINKS : 0; enum follow_symlinks_result result; result = get_oid_with_context(obj_name, flags, &data->oid, &ctx); |