diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-02 03:25:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-02 07:59:50 +0300 |
| commit | 2182abd94bf69a8daba18e71efae3e9f02a6c465 (patch) | |
| tree | 23d79183a42224fc33bab5530b7f795d24f0001a /builtin | |
| parent | 34caab0261d87b230520f97f2d1ce9ca4474dc73 (diff) | |
split-index: convert struct split_index to object_id
Convert the base_sha1 member of struct split_index to use struct
object_id and rename it base_oid. Include cache.h to make the structure
visible.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rev-parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 36b2087782..55c0b90441 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -887,8 +887,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) if (read_cache() < 0) die(_("Could not read the index")); if (the_index.split_index) { - const unsigned char *sha1 = the_index.split_index->base_sha1; - const char *path = git_path("sharedindex.%s", sha1_to_hex(sha1)); + const struct object_id *oid = &the_index.split_index->base_oid; + const char *path = git_path("sharedindex.%s", oid_to_hex(oid)); strbuf_reset(&buf); puts(relative_path(path, prefix, &buf)); } |