summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-06-02 05:54:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-02 15:48:41 (GMT)
commit1282988b4d3d37926050a5f21ad4f7516d9a2d7f (patch)
treee47ac3ce5400e8da57a55a61cee16bf72f0f4f45
parent2381e39e5ff740883b98c5aca019950f9167b67f (diff)
downloadgit-1282988b4d3d37926050a5f21ad4f7516d9a2d7f.zip
git-1282988b4d3d37926050a5f21ad4f7516d9a2d7f.tar.gz
git-1282988b4d3d37926050a5f21ad4f7516d9a2d7f.tar.bz2
status: fix bug with missing --ignore files
Commit 1b908b6 (wt-status: rename and restructure status-print-untracked, 2010-04-10) converted the wt_status_print_untracked function into wt_status_print_other, taking a string_list of either untracked or ignored items to print. However, the "nothing to show" early return still checked the wt_status->untracked list instead of the passed-in list. That meant that if we had ignored items to show, but no untracked items, we would erroneously exit early and fail to show the ignored items. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--wt-status.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c
index 7bda995..160e841 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -551,7 +551,7 @@ static void wt_status_print_other(struct wt_status *s,
int i;
struct strbuf buf = STRBUF_INIT;
- if (!s->untracked.nr)
+ if (!l->nr)
return;
wt_status_print_other_header(s, what, how);