From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Sat, 6 May 2017 22:10:31 +0000 (+0000)
Subject: builtin/ls-files: convert overlay_tree_on_cache to object_id
X-Git-Tag: v2.14.0-rc0~166^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f37eb7d858ef7fff79ee083c98ee99ab9bc05a4;p=git

builtin/ls-files: convert overlay_tree_on_cache to object_id

This is another caller of parse_tree_indirect.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index a6c70dbe9e..da0ff849f0 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);