diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
---|---|---|
committer | Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
commit | ff08e56cde739152a59a86f5aa996954a2ec0614 (patch) | |
tree | 9c7bc94151c5a082377ecb438e66aea140924edb /builtin/show-ref.c | |
parent | 2f899857a9f425cb59f8a15c2ea7a52100c51a23 (diff) | |
parent | 4f01e5080c4a7eee69da47c958888358e6127584 (diff) | |
download | git-ff08e56cde739152a59a86f5aa996954a2ec0614.tar.gz git-ff08e56cde739152a59a86f5aa996954a2ec0614.tar.xz |
Merge branch 'bc/object-id' into base
Diffstat (limited to 'builtin/show-ref.c')
-rw-r--r-- | builtin/show-ref.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 013d241ab..41e5e71ca 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -38,7 +38,7 @@ static void show_one(const char *refname, const struct object_id *oid) if (!deref_tags) return; - if (!peel_ref(refname, peeled.hash)) { + if (!peel_ref(refname, &peeled)) { hex = find_unique_abbrev(peeled.hash, abbrev); printf("%s %s^{}\n", hex, refname); } @@ -197,7 +197,7 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix) struct object_id oid; if ((starts_with(*pattern, "refs/") || !strcmp(*pattern, "HEAD")) && - !read_ref(*pattern, oid.hash)) { + !read_ref(*pattern, &oid)) { show_one(*pattern, &oid); } else if (!quiet) |