From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 May 2010 11:02:23 +0000 (-0700)
Subject: Merge branch 'mg/advice-statushints'
X-Git-Tag: v1.7.2-rc0~104
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=82e7ee7351d6e328294016d3b99825d8001abd24;p=git.git

Merge branch 'mg/advice-statushints'

* mg/advice-statushints:
  wt-status: take advice.statusHints seriously
  t7508: test advice.statusHints

Conflicts:
	wt-status.c
---

82e7ee7351d6e328294016d3b99825d8001abd24
diff --cc wt-status.c
index 84a9002b8,d44486c82..14e0acce8
--- a/wt-status.c
+++ b/wt-status.c
@@@ -646,12 -622,12 +646,14 @@@ void wt_status_print(struct wt_status *
  		wt_status_print_submodule_summary(s, 0);  /* staged */
  		wt_status_print_submodule_summary(s, 1);  /* unstaged */
  	}
 -	if (s->show_untracked_files)
 -		wt_status_print_untracked(s);
 -	else if (s->commitable)
 +	if (s->show_untracked_files) {
 +		wt_status_print_other(s, &s->untracked, "Untracked", "add");
 +		if (s->show_ignored_files)
 +			wt_status_print_other(s, &s->ignored, "Ignored", "add -f");
 +	} else if (s->commitable)
- 		 fprintf(s->fp, "# Untracked files not listed (use -u option to show untracked files)\n");
+ 		fprintf(s->fp, "# Untracked files not listed%s\n",
+ 			advice_status_hints
+ 			? " (use -u option to show untracked files)" : "");
  
  	if (s->verbose)
  		wt_status_print_verbose(s);