diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-07 00:10:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 08:12:58 +0200 |
| commit | 6f37eb7d858ef7fff79ee083c98ee99ab9bc05a4 (patch) | |
| tree | d1d023a1b65911e4dab35de85e5b5e7bbd926e31 | |
| parent | builtin/read-tree: convert to struct object_id (diff) | |
| download | git-6f37eb7d858ef7fff79ee083c98ee99ab9bc05a4.tar.xz git-6f37eb7d858ef7fff79ee083c98ee99ab9bc05a4.zip | |
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>
| -rw-r--r-- | builtin/ls-files.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |