diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-03-25 16:34:19 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-25 09:20:33 -0700 |
| commit | f0096c06bcdeb7aa6ae8a749ddc9d6d4a2c381d1 (patch) | |
| tree | b5b28251c9e48186b9e6168cbfefe4ace0f57602 /builtin/ls-tree.c | |
| parent | ffd31f661d5c5dddc091750ca86cfaa5d9d04b38 (diff) | |
| download | git-f0096c06bcdeb7aa6ae8a749ddc9d6d4a2c381d1.tar.gz git-f0096c06bcdeb7aa6ae8a749ddc9d6d4a2c381d1.tar.xz | |
Convert read_tree{,_recursive} to support struct pathspec
This patch changes behavior of the two functions. Previously it does
prefix matching only. Now it can also do wildcard matching.
All callers are updated. Some gain wildcard matching (archive,
checkout), others reset pathspec_item.has_wildcard to retain old
behavior (ls-files, ls-tree as they are plumbing).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/ls-tree.c')
| -rw-r--r-- | builtin/ls-tree.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index f73e6bd96..429072339 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -19,7 +19,7 @@ static int line_termination = '\n'; #define LS_SHOW_SIZE 16 static int abbrev; static int ls_options; -static const char **pathspec; +static struct pathspec pathspec; static int chomp_prefix; static const char *ls_tree_prefix; @@ -35,7 +35,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname) if (ls_options & LS_RECURSIVE) return 1; - s = pathspec; + s = pathspec.raw; if (!s) return 0; @@ -120,7 +120,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) { unsigned char sha1[20]; struct tree *tree; - int full_tree = 0; + int i, full_tree = 0; const struct option ls_tree_options[] = { OPT_BIT('d', NULL, &ls_options, "only show trees", LS_TREE_ONLY), @@ -166,11 +166,13 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) if (get_sha1(argv[0], sha1)) die("Not a valid object name %s", argv[0]); - pathspec = get_pathspec(prefix, argv + 1); + init_pathspec(&pathspec, get_pathspec(prefix, argv + 1)); + for (i = 0; i < pathspec.nr; i++) + pathspec.items[i].has_wildcard = 0; tree = parse_tree_indirect(sha1); if (!tree) die("not a tree object"); - read_tree_recursive(tree, "", 0, 0, pathspec, show_tree, NULL); + read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL); return 0; } |