undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/ls-files: convert overlay_tree_on_cache to object_id

Browse Source 
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>
This commit is contained in:
brian m. carlson 2017-05-06 22:10:31 +00:00 committed by Junio C Hamano
parent 4939e2c435
commit 6f37eb7d85
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/ls-files.c
View File

@ -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) void overlay_tree_on_cache(const char *tree_name, const char *prefix)
{ {
struct tree *tree; struct tree *tree;
unsigned char sha1[20]; struct object_id oid;
struct pathspec pathspec; struct pathspec pathspec;
struct cache_entry *last_stage0 = NULL; struct cache_entry *last_stage0 = NULL;
int i; int i;
if (get_sha1(tree_name, sha1)) if (get_oid(tree_name, &oid))
die("tree-ish %s not found.", tree_name); die("tree-ish %s not found.", tree_name);
tree = parse_tree_indirect(sha1); tree = parse_tree_indirect(oid.hash);
if (!tree) if (!tree)
die("bad tree-ish %s", tree_name); die("bad tree-ish %s", tree_name);