summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2015-02-08 16:01:37 +0700
committerJunio C Hamano <gitster@pobox.com>2015-02-09 14:29:52 -0800
commit81b48cf4a9b34a5598246e50131e9e6545ac85f6 (patch)
treeb16896ff7c7493c3f2c89bb0885870abe27db640
parentbe05f390675cc5e5239169c173d437151c47efb8 (diff)
downloadgit-81b48cf4a9b34a5598246e50131e9e6545ac85f6.tar.gz
list-files -F: show submodules with the new indicator '&'
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-list-files.txt4
-rw-r--r--builtin/ls-files.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-list-files.txt b/Documentation/git-list-files.txt
index 475c6da42f..223f6fd806 100644
--- a/Documentation/git-list-files.txt
+++ b/Documentation/git-list-files.txt
@@ -54,8 +54,8 @@ OPTIONS
-F::
--classify::
- Append indicator (one of `*/=>@|`, which is executable,
- directory, socket, Solaris door, symlink, or fifo
+ Append indicator (one of `*/=>@|&`, which is executable,
+ directory, socket, Solaris door, symlink, fifo, or submodule
respectively) to entries.
-R::
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index d506fa27cb..651cd3c570 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -92,6 +92,8 @@ static void append_indicator(struct strbuf *sb, mode_t mode)
c = '|';
else if (S_ISSOCK(mode))
c = '=';
+ else if (S_ISGITLINK(mode))
+ c = '&';
#ifdef S_ISDOOR
else if (S_ISDOOR(mode))
c = '>';