Even then the helper should probably assume "ce", and write_eolinfo()
   itself should do the "is ce NULL?" check which is specific to its
   use-case.

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 79ecdce2c9c..cc3cece3830 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c

@@ -77,30 +77,6 @@ static void write_eolinfo(struct index_state *istate,
        }
 }

-static void write_index_eolinfo_to_buf(struct strbuf *sb, struct index_state *istate,
-                                      const struct cache_entry *ce)
-{
-       const char *i_txt = "";
-       if (ce && S_ISREG(ce->ce_mode))
-               i_txt = get_cached_convert_stats_ascii(istate, ce->name);
-       strbuf_addstr(sb, i_txt);
-}
-
-static void write_worktree_eolinfo_to_buf(struct strbuf *sb, const char *path)
-{
-       struct stat st;
-       const char *w_txt = "";
-       if (!lstat(path, &st) && S_ISREG(st.st_mode))
-               w_txt = get_wt_convert_stats_ascii(path);
-       strbuf_addstr(sb, w_txt);
-}
-
-static void write_eolattr_to_buf(struct strbuf *sb, struct index_state *istate,
-                                const char *path)
-{
-       strbuf_addstr(sb, get_convert_attr_ascii(istate, path));
-}
-
 static void write_name(const char *name)
 {
        /*

@@ -114,6 +90,7 @@ static void write_name(const char *name)
 static void write_name_to_buf(struct strbuf *sb, const char *name)
 {
        const char *rel = relative_path(name, prefix_len ? prefix : NULL, sb);
+
        if (line_terminator)
                quote_c_style(rel, sb, NULL, 0);
        else

@@ -270,6 +247,8 @@ static size_t expand_show_index(struct strbuf *sb, const char *start,
        const char *end;
        const char *p;
        size_t len = strbuf_expand_literal_cb(sb, start, NULL);
+       struct stat st;
+
        if (len)
                return len;
        if (*start != '(')

@@ -288,12 +267,16 @@ static size_t expand_show_index(struct strbuf *sb, const char *start,
                strbuf_add_unique_abbrev(sb, &data->ce->oid, abbrev);
        else if (skip_prefix(start, "(stage)", &p))
                strbuf_addf(sb, "%d", ce_stage(data->ce));
-       else if (skip_prefix(start, "(eolinfo:index)", &p))
-               write_index_eolinfo_to_buf(sb, data->istate, data->ce);
-       else if (skip_prefix(start, "(eolinfo:worktree)", &p))
-               write_worktree_eolinfo_to_buf(sb, data->pathname);
+       else if (skip_prefix(start, "(eolinfo:index)", &p) &&
+                S_ISREG(data->ce->ce_mode))
+               strbuf_addstr(sb, get_cached_convert_stats_ascii(data->istate,
+                                                                data->ce->name));
+       else if (skip_prefix(start, "(eolinfo:worktree)", &p) &&
+                !lstat(data->pathname, &st) && S_ISREG(st.st_mode))
+               strbuf_addstr(sb, get_wt_convert_stats_ascii(data->pathname));
        else if (skip_prefix(start, "(eolattr)", &p))
-               write_eolattr_to_buf(sb, data->istate, data->pathname);
+               strbuf_addstr(sb, get_convert_attr_ascii(data->istate,
+                                                        data->pathname));
        else if (skip_prefix(start, "(path)", &p))
                write_name_to_buf(sb, data->pathname);
        else

@@ -310,13 +293,12 @@ static void show_ce_fmt(struct repository *repo, const struct cache_entry *ce,
                .istate = repo->index,
                .ce = ce,
        };
-
        struct strbuf sb = STRBUF_INIT;
+
        strbuf_expand(&sb, format, expand_show_index, &data);
        strbuf_addch(&sb, line_terminator);
        fwrite(sb.buf, sb.len, 1, stdout);
        strbuf_release(&sb);
-       return;
 }

 static void show_ce(struct repository *repo, struct dir_struct *dir,

diff --git a/t/t3013-ls-files-format.sh b/t/t3013-ls-files-format.sh
index 60c415aafd6..baf03f9096e 100755
--- a/t/t3013-ls-files-format.sh
+++ b/t/t3013-ls-files-format.sh

@@ -40,27 +40,13 @@ test_expect_success 'git ls-files --format objectname' '
        test_cmp expect actual
 '

-test_expect_success 'git ls-files --format eolinfo:index' '
-       cat >expect <<-\EOF &&
-       lf
-       lf
-       EOF
-       git ls-files --format="%(eolinfo:index)" >actual &&
-       test_cmp expect actual
-'
-
-test_expect_success 'git ls-files --format eolinfo:worktree' '
-       cat >expect <<-\EOF &&
-       lf
-       lf
-       EOF
-       git ls-files --format="%(eolinfo:worktree)" >actual &&
-       test_cmp expect actual
-'
-
-test_expect_success 'git ls-files --format eolattr' '
-       printf "\n\n" >expect &&
-       git ls-files --format="%(eolattr)" >actual &&
+HT='   '
+WS='    '
+test_expect_success 'git ls-files --format v.s. --eol' '
+       git ls-files --eol >expect 2>err &&
+       test_must_be_empty err &&
+       git ls-files --format="i/%(eolinfo:index)${WS}w/%(eolinfo:worktree)${WS}attr/${WS}${WS}${WS}${WS} ${HT}%(path)" >actual 2>err &&
+       test_must_be_empty err &&
        test_cmp expect actual
 '