undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls-files: Add support in ls-files to display the fsmonitor valid bit

Browse Source 
Add a new command line option (-f) to ls-files to have it use lowercase
letters for 'fsmonitor valid' files

Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ben Peart 2017-09-22 12:35:42 -04:00 committed by Junio C Hamano
parent 780494b1f5
commit d8c71db866
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/ls-files.c
View File

@ -31,6 +31,7 @@ static int show_resolve_undo;
static int show_modified; static int show_modified;
static int show_killed; static int show_killed;
static int show_valid_bit; static int show_valid_bit;
static int show_fsmonitor_bit;
static int line_terminator = '\n'; static int line_terminator = '\n';
static int debug_mode; static int debug_mode;
static int show_eol; static int show_eol;
@ -86,7 +87,8 @@ static const char *get_tag(const struct cache_entry *ce, const char *tag)
{ {
static char alttag[4]; static char alttag[4];
if (tag && *tag && show_valid_bit && (ce->ce_flags & CE_VALID)) { if (tag && *tag && ((show_valid_bit && (ce->ce_flags & CE_VALID)) ||
(show_fsmonitor_bit && (ce->ce_flags & CE_FSMONITOR_VALID)))) {
memcpy(alttag, tag, 3); memcpy(alttag, tag, 3);
if (isalpha(tag[0])) { if (isalpha(tag[0])) {
@ -515,6 +517,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
N_("identify the file status with tags")), N_("identify the file status with tags")),
OPT_BOOL('v', NULL, &show_valid_bit, OPT_BOOL('v', NULL, &show_valid_bit,
N_("use lowercase letters for 'assume unchanged' files")), N_("use lowercase letters for 'assume unchanged' files")),
OPT_BOOL('f', NULL, &show_fsmonitor_bit,
N_("use lowercase letters for 'fsmonitor clean' files")),
OPT_BOOL('c', "cached", &show_cached, OPT_BOOL('c', "cached", &show_cached,
N_("show cached files in the output (default)")), N_("show cached files in the output (default)")),
OPT_BOOL('d', "deleted", &show_deleted, OPT_BOOL('d', "deleted", &show_deleted,
@ -584,7 +588,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
for (i = 0; i < exclude_list.nr; i++) { for (i = 0; i < exclude_list.nr; i++) {
add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args); add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args);
} }
if (show_tag || show_valid_bit) { if (show_tag || show_valid_bit || show_fsmonitor_bit) {
tag_cached = "H "; tag_cached = "H ";
tag_unmerged = "M "; tag_unmerged = "M ";
tag_removed = "R "; tag_removed = "R ";