From: Jeff King <peff@peff.net>
Date: Thu, 2 Jun 2011 05:54:49 +0000 (-0400)
Subject: status: fix bug with missing --ignore files
X-Git-Tag: v1.7.7-rc0~122^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1282988b4d3d37926050a5f21ad4f7516d9a2d7f;p=git.git

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>
---

diff --git a/wt-status.c b/wt-status.c
index 7bda9953e..160e84126 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);