Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
builtin/ls-files: convert overlay_tree_on_cache to object_id
author
brian m. carlson
<sandals@crustytoothpaste.net>
Sat, 6 May 2017 22:10:31 +0000
(22:10 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 8 May 2017 06:12:58 +0000
(15:12 +0900)
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>
builtin/ls-files.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
4939e2c
)
diff --git
a/builtin/ls-files.c
b/builtin/ls-files.c
index a6c70dbe9ec84921108a85485a12111c854833b8..da0ff849f02afbd273c165da65fe60b462d9e1f8 100644
(file)
--- 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);