diff options
| author | Jeff King <peff@peff.net> | 2008-10-16 11:07:26 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-17 12:46:59 -0700 |
| commit | 98fa473887d0bebd38d568bb07232a336a642dcf (patch) | |
| tree | bce65b20193d1fc4f51ca64d6bdad4718609ff29 /wt-status.c | |
| parent | 8ed0a740dd42bd0724aebed6e3b07c4ea2a2d5e8 (diff) | |
| download | git-98fa473887d0bebd38d568bb07232a336a642dcf.tar.gz | |
refactor handling of "other" files in ls-files and status
When the "git status" display code was originally converted
to C, we copied the code from ls-files to discover whether a
pathname returned by read_directory was an "other", or
untracked, file.
Much later, 5698454e updated the code in ls-files to handle
some new cases caused by gitlinks. This left the code in
wt-status.c broken: it would display submodule directories
as untracked directories. Nobody noticed until now, however,
because unless status.showUntrackedFiles was set to "all",
submodule directories were not actually reported by
read_directory. So the bug was only triggered in the
presence of a submodule _and_ this config option.
This patch pulls the ls-files code into a new function,
cache_name_is_other, and uses it in both places. This should
leave the ls-files functionality the same and fix the bug
in status.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/wt-status.c b/wt-status.c index 889e50f89f..64cedfcbe1 100644 --- a/wt-status.c +++ b/wt-status.c @@ -275,20 +275,9 @@ static void wt_status_print_untracked(struct wt_status *s) read_directory(&dir, ".", "", 0, NULL); for(i = 0; i < dir.nr; i++) { - /* check for matching entry, which is unmerged; lifted from - * builtin-ls-files:show_other_files */ struct dir_entry *ent = dir.entries[i]; - int pos = cache_name_pos(ent->name, ent->len); - struct cache_entry *ce; - if (0 <= pos) - die("bug in wt_status_print_untracked"); - pos = -pos - 1; - if (pos < active_nr) { - ce = active_cache[pos]; - if (ce_namelen(ce) == ent->len && - !memcmp(ce->name, ent->name, ent->len)) - continue; - } + if (!cache_name_is_other(ent->name, ent->len)) + continue; if (!shown_header) { s->workdir_untracked = 1; wt_status_print_header(s, "Untracked files", |