diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:15:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:15:59 -0800 |
| commit | 05f1539b7fb4809a406feaa8434bc2c58155d13d (patch) | |
| tree | d1c722db091df355798c90e039bf5f9e1b9c2074 /builtin | |
| parent | 1cb3ed308dcfaa6084b8aed075c772aeb9e57243 (diff) | |
| parent | a7630bd4274a0dff7cff8b92de3d3f064e321359 (diff) | |
| download | git-05f1539b7fb4809a406feaa8434bc2c58155d13d.tar.gz git-05f1539b7fb4809a406feaa8434bc2c58155d13d.tar.xz | |
Merge branch 'tb/ls-files-eol'
"git ls-files" learned a new "--eol" option to help diagnose
end-of-line problems.
* tb/ls-files-eol:
ls-files: add eol diagnostics
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/ls-files.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b6a7cb0c7..dedf02dc7 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -27,6 +27,7 @@ static int show_killed; static int show_valid_bit; static int line_terminator = '\n'; static int debug_mode; +static int show_eol; static const char *prefix; static int max_prefix_len; @@ -47,6 +48,23 @@ static const char *tag_modified = ""; static const char *tag_skip_worktree = ""; static const char *tag_resolve_undo = ""; +static void write_eolinfo(const struct cache_entry *ce, const char *path) +{ + if (!show_eol) + return; + else { + struct stat st; + const char *i_txt = ""; + const char *w_txt = ""; + const char *a_txt = get_convert_attr_ascii(path); + if (ce && S_ISREG(ce->ce_mode)) + i_txt = get_cached_convert_stats_ascii(ce->name); + if (!lstat(path, &st) && S_ISREG(st.st_mode)) + w_txt = get_wt_convert_stats_ascii(path); + printf("i/%-5s w/%-5s attr/%-17s\t", i_txt, w_txt, a_txt); + } +} + static void write_name(const char *name) { /* @@ -68,6 +86,7 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent) return; fputs(tag, stdout); + write_eolinfo(NULL, ent->name); write_name(ent->name); } @@ -170,6 +189,7 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce) find_unique_abbrev(ce->sha1,abbrev), ce_stage(ce)); } + write_eolinfo(ce, ce->name); write_name(ce->name); if (debug_mode) { const struct stat_data *sd = &ce->ce_stat_data; @@ -433,6 +453,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) OPT_BIT(0, "directory", &dir.flags, N_("show 'other' directories' names only"), DIR_SHOW_OTHER_DIRECTORIES), + OPT_BOOL(0, "eol", &show_eol, N_("show line endings of files")), OPT_NEGBIT(0, "empty-directory", &dir.flags, N_("don't show empty directories"), DIR_HIDE_EMPTY_DIRECTORIES), |