diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:12:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:12:18 -0700 |
| commit | e75bf76f5462af4185d8260f6feecf24dd24a516 (patch) | |
| tree | f079b41f350ea291f968ad531298053212c15922 /builtin-ls-tree.c | |
| parent | 1c7ac06dc612c469d74be6be8164465d65a7829a (diff) | |
| parent | 489e351ea03e78746bad0c0ad4fcf4a63920256d (diff) | |
| download | git-e75bf76f5462af4185d8260f6feecf24dd24a516.tar.gz | |
Merge branch 'rs/archive'
* rs/archive:
archive: remove extra arguments parsing code
archive: unify file attribute handling
archive: centralize archive entry writing
archive: add baselen member to struct archiver_args
add context pointer to read_tree_recursive()
archive: remove args member from struct archiver
Diffstat (limited to 'builtin-ls-tree.c')
| -rw-r--r-- | builtin-ls-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-ls-tree.c b/builtin-ls-tree.c index f4a75ddbc3..0da047c3bd 100644 --- a/builtin-ls-tree.c +++ b/builtin-ls-tree.c @@ -56,7 +56,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname) } static int show_tree(const unsigned char *sha1, const char *base, int baselen, - const char *pathname, unsigned mode, int stage) + const char *pathname, unsigned mode, int stage, void *context) { int retval = 0; const char *type = blob_type; @@ -189,7 +189,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) tree = parse_tree_indirect(sha1); if (!tree) die("not a tree object"); - read_tree_recursive(tree, "", 0, 0, pathspec, show_tree); + read_tree_recursive(tree, "", 0, 0, pathspec, show_tree, NULL); return 0; } |