Merge branch 'jk/maint-1.7.2-status-ignored'

* 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
This commit is contained in:
Junio C Hamano
2011-06-29 17:03:12 -07:00
3 changed files with 128 additions and 2 deletions

View File

@ -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);