diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-11 21:51:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-11 21:51:10 -0700 |
| commit | 3fc44a10f62fdca29558dc553a3e12949af30637 (patch) | |
| tree | 988ded72a36c0e6eaf2d6cd109423f92e09fd6a1 /wt-status.c | |
| parent | 30962fb7fba9a8e57fe34a70bc8abd2e0af8b2ee (diff) | |
| parent | 150b493ad42757b60eacbf98ff11982456481982 (diff) | |
| download | git-3fc44a10f62fdca29558dc553a3e12949af30637.tar.gz | |
Merge branch 'jk/maint-1.7.2-status-ignored' into maint
* jk/maint-1.7.2-status-ignored:
git status --ignored: tests and docs
status: fix bug with missing --ignore files
Conflicts:
Documentation/git-status.txt
t/t7508-status.sh
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 9f4e0ba9c1..02377729c4 100644 --- a/wt-status.c +++ b/wt-status.c @@ -642,7 +642,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); |