summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-17 13:03:52 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-17 13:03:52 -0700
commite845e16ee6de99a203db47eeb840daf3b1914ec9 (patch)
tree6881244e543cbf5b17cb31a8b8512fa758a608b5 /wt-status.c
parent46dc1b0e332612aa32c139007fa33f4b429de9d1 (diff)
parent98fa473887d0bebd38d568bb07232a336a642dcf (diff)
downloadgit-e845e16ee6de99a203db47eeb840daf3b1914ec9.tar.gz
Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other
* jk/maint-ls-files-other: refactor handling of "other" files in ls-files and status Conflicts: read-cache.c
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/wt-status.c b/wt-status.c
index d2eac36aea..c3a9cab898 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -277,20 +277,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_untracked_header(s);