diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-08-20 20:47:01 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-23 17:13:33 -0700 |
| commit | c28b3d6e7b0471a02f81324a90b26effae0f4bde (patch) | |
| tree | 8703845ea95ac8755a183d18fd13540eb7768a1e /builtin-ls-files.c | |
| parent | b5041c5f3b9ea70ce7aa9711af6ed6f2d02909b0 (diff) | |
| download | git-c28b3d6e7b0471a02f81324a90b26effae0f4bde.tar.gz | |
Read .gitignore from index if it is skip-worktree
This adds index as a prerequisite for directory listing (with
exclude). At the moment directory listing is used by "git clean",
"git add", "git ls-files" and "git status"/"git commit" and
unpack_trees()-related commands. These commands have been
checked/modified to populate index before doing directory listing.
add_excludes_from_file() does not enable this feature, because it
is used to read .git/info/exclude and some explicit files specified
by "git ls-files".
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-ls-files.c')
| -rw-r--r-- | builtin-ls-files.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c index ad7e44784f..2e47242b9d 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -485,6 +485,9 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) prefix_offset = strlen(prefix); git_config(git_default_config, NULL); + if (read_cache() < 0) + die("index file corrupt"); + argc = parse_options(argc, argv, prefix, builtin_ls_files_options, ls_files_usage, 0); if (show_tag || show_valid_bit) { @@ -513,7 +516,6 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) pathspec = get_pathspec(prefix, argv); /* be nice with submodule paths ending in a slash */ - read_cache(); if (pathspec) strip_trailing_slash_from_submodules(); |