From: brian m. carlson Date: Sat, 06 May 2017 22:10:31 GMT Subject: [PATCH v3 46/53] builtin/ls-files: convert overlay_tree_on_cache to object_id Message-ID: <20170506221038.296722-47-sandals@crustytoothpaste.net> In-Reply-To: <20170506221038.296722-1-sandals@crustytoothpaste.net> This is another caller of parse_tree_indirect. Signed-off-by: brian m. carlson --- builtin/ls-files.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index a6c70dbe9..da0ff849f 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -414,14 +414,14 @@ static void prune_cache(const char *prefix, size_t prefixlen) void overlay_tree_on_cache(const char *tree_name, const char *prefix) { struct tree *tree; - unsigned char sha1[20]; + struct object_id oid; struct pathspec pathspec; struct cache_entry *last_stage0 = NULL; int i; - if (get_sha1(tree_name, sha1)) + if (get_oid(tree_name, &oid)) die("tree-ish %s not found.", tree_name); - tree = parse_tree_indirect(sha1); + tree = parse_tree_indirect(oid.hash); if (!tree) die("bad tree-ish %s", tree_name);