From: ZheNing Hu <adlternative@xxxxxxxxx>
Because sometimes we want to check if the files in the
index match the sparse specification by using
`git ls-files -t`, but `-t` option have semi-deprecated,
So introduce "%(skipworktree)" atom to git ls-files
`--format` option. When we use this option, if the file
match the sparse specification and removed from working
tree, it will output "yes", othewise, output "no".
Signed-off-by: ZheNing Hu <adlternative@xxxxxxxxx>
---
ls-files: add %(skipworktree) atom to format option
git ls-files -t is semi-deprecated, but in face we need to use -t option
to check if a file in the index match the sparse specification.
So I think this feature can be migrated to git ls-files --format, add a
%(skipworktree) atom to indicate whether the file in the index match the
sparse specification and is removed from the working tree.
v1: add %(skipworktree) atom to git ls-files format option.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1458%2Fadlternative%2Fzh%2Fls-file-format-skipworktree-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1458/adlternative/zh/ls-file-format-skipworktree-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1458
Documentation/git-ls-files.txt | 6 ++++++
builtin/ls-files.c | 3 +++
t/t3013-ls-files-format.sh | 22 ++++++++++++++++++++++
3 files changed, 31 insertions(+)
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 440043cdb8e..0e50307121d 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -260,6 +260,12 @@ eolattr::
that applies to the path.
path::
The pathname of the file which is recorded in the index.
+skipworktree::
+ If the file in the index marked with SKIP_WORKTREE bit.
+ It means the file do not match the sparse specification
+ and removed from working tree.
+ See link:technical/sparse-checkout.txt[sparse-checkout]
+ for more information.
EXCLUDE PATTERNS
----------------
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index a03b559ecaa..d1a27f28f01 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -280,6 +280,9 @@ static size_t expand_show_index(struct strbuf *sb, const char *start,
data->pathname));
else if (skip_prefix(start, "(path)", &p))
write_name_to_buf(sb, data->pathname);
+ else if (skip_prefix(start, "(skipworktree)", &p))
+ strbuf_addstr(sb, ce_skip_worktree(data->ce) ?
+ "true" : "false");
else
die(_("bad ls-files format: %%%.*s"), (int)len, start);
diff --git a/t/t3013-ls-files-format.sh b/t/t3013-ls-files-format.sh
index efb7450bf1e..ac8b865c275 100755
--- a/t/t3013-ls-files-format.sh
+++ b/t/t3013-ls-files-format.sh
@@ -92,4 +92,26 @@ test_expect_success 'git ls-files --format with --debug' '
test_cmp expect actual
'
+test_expect_success 'git ls-files --format with skipworktree' '
+ mkdir dir1 dir2 &&
+ echo "file1" >dir1/file1.txt &&
+ echo "file2" >dir2/file2.txt &&
+ git add dir1 dir2 &&
+ git commit -m skipworktree &&
+ git sparse-checkout set dir1 &&
+ git ls-files --format="%(path) %(skipworktree)" >actual &&
+ cat >expect <<-\EOF &&
+ dir1/file1.txt false
+ dir2/file2.txt true
+ o1.txt false
+ o2.txt false
+ o3.txt false
+ o4.txt false
+ o5.txt false
+ o6.txt false
+ o7.txt false
+ EOF
+ test_cmp expect actual
+'
+
test_done
base-commit: a38d39a4c50d1275833aba54c4dbdfce9e2e9ca1
--
gitgitgadget
