diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:47 -0700 |
| commit | df46d77e00e7bbcfe46cc06c071fa5284f96c327 (patch) | |
| tree | 01b7e694bd31454103afc694559dc7a34967b899 /builtin/ls-tree.c | |
| parent | 5ac913c6eb266e836f91c39c3b03bcbdc06475c6 (diff) | |
| download | git-df46d77e00e7bbcfe46cc06c071fa5284f96c327.tar.gz | |
tree: convert read_tree_recursive to struct object_id
Convert the callback functions for read_tree_recursive to take a pointer
to struct object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/ls-tree.c')
| -rw-r--r-- | builtin/ls-tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index ef965408e8..c613dd7b82 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -60,7 +60,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname) return 0; } -static int show_tree(const unsigned char *sha1, struct strbuf *base, +static int show_tree(const struct object_id *oid, struct strbuf *base, const char *pathname, unsigned mode, int stage, void *context) { int retval = 0; @@ -94,7 +94,7 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base, char size_text[24]; if (!strcmp(type, blob_type)) { unsigned long size; - if (sha1_object_info(sha1, &size) == OBJ_BAD) + if (sha1_object_info(oid->hash, &size) == OBJ_BAD) xsnprintf(size_text, sizeof(size_text), "BAD"); else @@ -103,11 +103,11 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base, } else xsnprintf(size_text, sizeof(size_text), "-"); printf("%06o %s %s %7s\t", mode, type, - find_unique_abbrev(sha1, abbrev), + find_unique_abbrev(oid->hash, abbrev), size_text); } else printf("%06o %s %s\t", mode, type, - find_unique_abbrev(sha1, abbrev)); + find_unique_abbrev(oid->hash, abbrev)); } baselen = base->len; strbuf_addstr(base, pathname); |