diff options
| author | Stefan Beller <sbeller@google.com> | 2018-04-25 21:20:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-26 04:54:27 +0300 |
| commit | 0df8e96566ddcae4adc4efc096944c064f60b8bd (patch) | |
| tree | 19c8b0277b21dcd9a9baa71ca5541bd59853afae /blame.c | |
| parent | 7ecd8690602170f0993923c99645c7c6005e3dfa (diff) | |
cache.h: add repository argument to oid_object_info
Add a repository argument to allow the callers of oid_object_info
to be more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'blame.c')
| -rw-r--r-- | blame.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -81,7 +81,7 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path) unsigned mode; if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) && - oid_object_info(&blob_oid, NULL) == OBJ_BLOB) + oid_object_info(the_repository, &blob_oid, NULL) == OBJ_BLOB) return; } @@ -504,7 +504,7 @@ static int fill_blob_sha1_and_mode(struct blame_origin *origin) return 0; if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode)) goto error_out; - if (oid_object_info(&origin->blob_oid, NULL) != OBJ_BLOB) + if (oid_object_info(the_repository, &origin->blob_oid, NULL) != OBJ_BLOB) goto error_out; return 0; error_out: |