diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/cat-file.c | 6 | ||||
| -rw-r--r-- | builtin/grep.c | 3 | ||||
| -rw-r--r-- | builtin/log.c | 3 | ||||
| -rw-r--r-- | builtin/rev-parse.c | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 2ca56fd086..7622c502f0 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -73,7 +73,8 @@ 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_OID_RECORD_PATH, + if (get_oid_with_context(the_repository, obj_name, + GET_OID_RECORD_PATH, &oid, &obj_context)) die("Not a valid object name %s", obj_name); @@ -382,7 +383,8 @@ static void batch_one_object(const char *obj_name, 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); + result = get_oid_with_context(the_repository, obj_name, + flags, &data->oid, &ctx); if (result != FOUND) { switch (result) { case MISSING_OBJECT: diff --git a/builtin/grep.c b/builtin/grep.c index 0cc671f7d6..fc7a9a9283 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1021,7 +1021,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix) break; } - if (get_oid_with_context(arg, GET_OID_RECORD_PATH, + if (get_oid_with_context(the_repository, arg, + GET_OID_RECORD_PATH, &oid, &oc)) { if (seen_dashdash) die(_("unable to resolve revision: %s"), arg); diff --git a/builtin/log.c b/builtin/log.c index e8e51068bd..dbfb4e31ad 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -508,7 +508,8 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c !rev->diffopt.flags.allow_textconv) return stream_blob_to_fd(1, oid, NULL, 0); - if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH, + if (get_oid_with_context(the_repository, obj_name, + GET_OID_RECORD_PATH, &oidc, &obj_context)) die(_("Not a valid object name %s"), obj_name); if (!obj_context.path || diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 10d4dab894..910a71ed8b 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -933,7 +933,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) name++; type = REVERSED; } - if (!get_oid_with_context(name, flags, &oid, &unused)) { + if (!get_oid_with_context(the_repository, name, + flags, &oid, &unused)) { if (verify) revs_count++; else |