[PATCH 09/25] list-files: add --max-depth, -R and default to --max-depth=0
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/list-files.c | 9 ++++++++-
t/t7013-list-files.sh | 40 ++++++++++++++++++++++++++++++++--------
2 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index 8913770..4599cf0 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -28,6 +28,7 @@ static const char *prefix;
static int prefix_length;
static int show_tag = -1;
static unsigned int colopts;
+static int max_depth;
static const char * const ls_usage[] = {
N_("git list-files [options] [<pathspec>...]"),
@@ -39,6 +40,11 @@ struct option ls_options[] = {
OPT_COLUMN('C', "column", &colopts, N_("show files in columns")),
OPT_SET_INT('1', NULL, &colopts,
N_("shortcut for --no-column"), COL_PARSEOPT),
+ { OPTION_INTEGER, 0, "max-depth", &max_depth, N_("depth"),
+ N_("descend at most <depth> levels"), PARSE_OPT_NONEG,
+ NULL, 1 },
+ OPT_SET_INT('R', "recursive", &max_depth,
+ N_("shortcut for --max-depth=-1"), -1),
OPT_END()
};
@@ -178,9 +184,10 @@ int cmd_list_files(int argc, const char **argv, const char *cmd_prefix)
parse_pathspec(&pathspec, 0,
PATHSPEC_PREFER_CWD |
+ (max_depth != -1 ? PATHSPEC_MAXDEPTH_VALID : 0) |
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
cmd_prefix, argv);
- pathspec.max_depth = 0;
+ pathspec.max_depth = max_depth;
pathspec.recursive = 1;
finalize_colopts(&colopts, -1);
diff --git a/t/t7013-list-files.sh b/t/t7013-list-files.sh
index b43245c..89930c7 100755
--- a/t/t7013-list-files.sh
+++ b/t/t7013-list-files.sh
@@ -10,8 +10,8 @@ test_expect_success 'setup' '
git add .
'
-test_expect_success 'list-files from index' '
- git list-files >actual &&
+test_expect_success 'list-files -R from index' '
+ git list-files -R >actual &&
cat >expect <<-\EOF &&
a
b
@@ -23,22 +23,34 @@ test_expect_success 'list-files from index' '
test_cmp expect actual
'
+test_expect_success 'list-files from index' '
+ git list-files --max-depth=0 >actual &&
+ cat >expect <<-\EOF &&
+ a
+ b
+ c
+ EOF
+ test_cmp expect actual &&
+ git list-files >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'column output' '
- COLUMNS=20 git list-files --column=always >actual &&
+ COLUMNS=20 git list-files -R --column=always >actual &&
cat >expected <<-\EOF &&
a sa/a
b sa/sb/b
c sc/c
EOF
test_cmp expected actual &&
- COLUMNS=20 git -c column.listfiles=always list-files >actual &&
+ COLUMNS=20 git -c column.listfiles=always list-files -R >actual &&
cat >expected <<-\EOF &&
a sa/a
b sa/sb/b
c sc/c
EOF
test_cmp expected actual &&
- COLUMNS=20 git -c column.listfiles=always list-files -1 >actual &&
+ COLUMNS=20 git -c column.listfiles=always list-files -1R >actual &&
cat >expected <<-\EOF &&
a
b
@@ -51,7 +63,7 @@ test_expect_success 'column output' '
'
test_expect_success 'list-files selectively from index' '
- git list-files "*a" >actual &&
+ git list-files -R "*a" >actual &&
cat >expect <<-\EOF &&
a
sa/a
@@ -59,10 +71,22 @@ test_expect_success 'list-files selectively from index' '
test_cmp expect actual
'
+test_expect_success '--max-depth' '
+ git list-files --max-depth=1 >actual &&
+ cat >expected <<-\EOF &&
+ a
+ b
+ c
+ sa/a
+ sc/c
+ EOF
+ test_cmp expected actual
+'
+
test_expect_success 'list-files from subdir ' '
(
cd sa &&
- git list-files >actual &&
+ git list-files -R >actual &&
cat >expect <<-\EOF &&
a
sb/b
@@ -74,7 +98,7 @@ test_expect_success 'list-files from subdir ' '
test_expect_success 'list-files from subdir (2)' '
(
cd sa &&
- git list-files ../a sb >actual &&
+ git list-files -R ../a sb >actual &&
cat >expect <<-\EOF &&
../a
sb/b
--
2.3.0.rc1.137.g477eb31
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>