diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-12 01:47:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-12 01:47:57 -0800 |
| commit | 8bb2e03b9d47d87657b67ddfaf712e736cf3db8f (patch) | |
| tree | 6d64f4bb7ca901baa8faf38c7f9afcef6fc709aa /ls-files.c | |
| parent | b92b2ce94e5673ab3a2fbc9c762b39aaf7d72de5 (diff) | |
| download | git-8bb2e03b9d47d87657b67ddfaf712e736cf3db8f.tar.gz | |
ls-files: split "show-valid-bit" into a different option.
To preserve compatibility with scripts that expect uppercase
letters to be shown, do not make '-t' to unconditionally show
the valid bit. Introduce '-v' option for that.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'ls-files.c')
| -rw-r--r-- | ls-files.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ls-files.c b/ls-files.c index 3f06ece84d..30296fd84f 100644 --- a/ls-files.c +++ b/ls-files.c @@ -20,6 +20,7 @@ static int show_unmerged = 0; static int show_modified = 0; static int show_killed = 0; static int show_other_directories = 0; +static int show_valid_bit = 0; static int line_terminator = '\n'; static int prefix_len = 0, prefix_offset = 0; @@ -447,7 +448,8 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce) if (pathspec && !match(pathspec, ce->name, len)) return; - if (tag && *tag && (ce->ce_flags & htons(CE_VALID))) { + if (tag && *tag && show_valid_bit && + (ce->ce_flags & htons(CE_VALID))) { static char alttag[4]; memcpy(alttag, tag, 3); if (isalpha(tag[0])) @@ -592,7 +594,7 @@ static void verify_pathspec(void) } static const char ls_files_usage[] = - "git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed|modified])* " + "git-ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* " "[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] " "[ --exclude-per-directory=<filename> ] [--full-name] [--] [<file>]*"; @@ -617,13 +619,15 @@ int main(int argc, const char **argv) line_terminator = 0; continue; } - if (!strcmp(arg, "-t")) { + if (!strcmp(arg, "-t") || !strcmp(arg, "-v")) { tag_cached = "H "; tag_unmerged = "M "; tag_removed = "R "; tag_modified = "C "; tag_other = "? "; tag_killed = "K "; + if (arg[1] == 'v') + show_valid_bit = 1; continue; } if (!strcmp(arg, "-c") || !strcmp(arg, "--cached")) { |