ls-files: Add eol diagnostics

index 265c9ba..7734715 100644
@@ -5,6 +5,7 @@
 #include "parse-options.h"
 
 static int all_attrs;
+static int eol_attrs;
 static int cached_attrs;
 static int stdin_paths;
 static const char * const check_attr_usage[] = {

@@ -17,6 +18,7 @@ static int nul_term_line;
 
 static const struct option check_attr_options[] = {
 	OPT_BOOL('a', "all", &all_attrs, N_("report all attributes set on file")),
+	OPT_BOOL('e', "eol", &eol_attrs, N_("report effective eol attributes set on file")),
 	OPT_BOOL(0,  "cached", &cached_attrs, N_("use .gitattributes only from the index")),
 	OPT_BOOL(0 , "stdin", &stdin_paths, N_("read file names from stdin")),
 	OPT_BOOL('z', NULL, &nul_term_line,

@@ -51,6 +53,23 @@ static void output_attr(int cnt, struct git_attr_check *check,
 	}
 }
 
+static void output_eol_attr(const char *file)
+{
+	struct stat st;
+	if (lstat(file, &st) || (!S_ISREG(st.st_mode)))
+		return;
+	if (nul_term_line) {
+		printf("%s:", file);
+		if (!lstat(file, &st) && (S_ISREG(st.st_mode)))
+			printf(": %-13s ", get_convert_attr_ascii(file));
+		printf("%c", 0);
+	} else {
+		quote_c_style(file, NULL, stdout, 0);
+		printf(": %-13s ", get_convert_attr_ascii(file));
+		printf("\n");
+	}
+}
+
 static void check_attr(const char *prefix, int cnt,
 	struct git_attr_check *check, const char *file)
 {

@@ -61,7 +80,9 @@ static void check_attr(const char *prefix, int cnt,
 			die("git_check_attr died");
 		output_attr(cnt, check, file);
 	} else {
-		if (git_all_attrs(full_path, &cnt, &check))
+		if (eol_attrs)
+			output_eol_attr(full_path);
+		else if (git_all_attrs(full_path, &cnt, &check))
 			die("git_all_attrs died");
 		output_attr(cnt, check, file);
 		free(check);

@@ -123,8 +144,13 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
 			doubledash = i;
 	}
 
-	/* Process --all and/or attribute arguments: */
-	if (all_attrs) {
+	if (eol_attrs) {
+		if (doubledash >= 1)
+			error_with_usage("Attributes and --eol both specified");
+		cnt = 0;
+		filei = doubledash + 1;
+	} else if (all_attrs) {
+		/* Process --all and/or attribute arguments: */
 		if (doubledash >= 1)
 			error_with_usage("Attributes and --all both specified");
 

@@ -159,7 +185,7 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
 			error_with_usage("No file specified");
 	}
 
-	if (all_attrs) {
+	if (all_attrs || eol_attrs) {
 		check = NULL;
 	} else {
 		check = xcalloc(cnt, sizeof(*check));

index b6a7cb0..ef892bc 100644
@@ -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,21 @@ 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)
+{
+	struct stat st;
+	const char *i_txt = "";
+	const char *w_txt = "";
+	if (!show_eol)
+		return;
+	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/%-13s w/%-13s attr/%-9s ", i_txt, w_txt,
+				 get_convert_attr_ascii(path));
+}
+
 static void write_name(const char *name)
 {
 	/*

@@ -68,6 +84,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 +187,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 +451,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),

104 lines not on this page · raw message

index d9d853c..ccf436b 100644
@@ -32,6 +32,9 @@ enum eol {
 };
 
 extern enum eol core_eol;
+extern const char *get_cached_convert_stats_ascii(const char *path);
+extern const char *get_wt_convert_stats_ascii(const char *path);
+extern const char *get_convert_attr_ascii(const char *path);
 
 /* returns 1 if *dst was used */
 extern int convert_to_git(const char *path, const char *src, size_t len,