X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=wt-status.c;h=64cedfcbe14ab0448ab6225b50244a45492a546a;hb=4d6acb70411cd4fe69610cf1b22f186fa01614f7;hp=889e50f89fc24984f700d14f7033600fa9fdf642;hpb=7e4ad908721445b073f3b4ecad55bbd78f032cdc;p=git.git

diff --git a/wt-status.c b/wt-status.c
index 889e50f89..64cedfcbe 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",