diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 05:38:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 05:38:16 (GMT) |
| commit | fcb6df325468a7ae12949ab80dcd37772b9b1fbf (patch) | |
| tree | 7ae13a8a1c4f7b417403b6f7f64f34a9565dbab2 /builtin/fast-export.c | |
| parent | d0f7b22b5bf0847a6e0fe039feb598819dffab4c (diff) | |
| parent | 9d98354f48997faf8251c566d909957f6ae427d5 (diff) | |
| download | git-fcb6df325468a7ae12949ab80dcd37772b9b1fbf.zip git-fcb6df325468a7ae12949ab80dcd37772b9b1fbf.tar.gz git-fcb6df325468a7ae12949ab80dcd37772b9b1fbf.tar.bz2 | |
Merge branch 'sb/oid-object-info'
The codepath around object-info API has been taught to take the
repository object (which in turn tells the API which object store
the objects are to be located).
* sb/oid-object-info:
cache.h: allow oid_object_info to handle arbitrary repositories
packfile: add repository argument to cache_or_unpack_entry
packfile: add repository argument to unpack_entry
packfile: add repository argument to read_object
packfile: add repository argument to packed_object_info
packfile: add repository argument to packed_to_object_type
packfile: add repository argument to retry_bad_packed_offset
cache.h: add repository argument to oid_object_info
cache.h: add repository argument to oid_object_info_extended
Diffstat (limited to 'builtin/fast-export.c')
| -rw-r--r-- | builtin/fast-export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index ea776e6..68a762f 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -950,7 +950,7 @@ static void import_marks(char *input_file) if (last_idnum < mark) last_idnum = mark; - type = oid_object_info(&oid, NULL); + type = oid_object_info(the_repository, &oid, NULL); if (type < 0) die("object not found: %s", oid_to_hex(&oid)); |