From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:08:19 +0000 (-0700)
Subject: Merge branch 'maint-1.7.5' into maint-1.7.6
X-Git-Tag: v1.7.6.5~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a574c04fbfa06d9b40c4c32db27135c503da7c15?ds=inline;hp=-c

Merge branch 'maint-1.7.5' into maint-1.7.6

* maint-1.7.5:
make the sample pre-commit hook script reject names with newlines, too
Reindent closing bracket using tab instead of spaces
Documentation/git-update-index: refer to 'ls-files'
---

a574c04fbfa06d9b40c4c32db27135c503da7c15
diff --combined wt-status.c
index 02377729c4,227622d154..c01838c5ad
--- a/wt-status.c
+++ b/wt-status.c
@@@ -394,7 -394,7 +394,7 @@@ static void wt_status_collect_changes_w
  	if (s->ignore_submodule_arg) {
  		DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
  		handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
-     }
+ 	}
  	rev.diffopt.format_callback = wt_status_collect_changed_cb;
  	rev.diffopt.format_callback_data = s;
  	init_pathspec(&rev.prune_data, s->pathspec);
@@@ -642,7 -642,7 +642,7 @@@ static void wt_status_print_other(struc
  	int i;
  	struct strbuf buf = STRBUF_INIT;
  
 -	if (!s->untracked.nr)
 +	if (!l->nr)
  		return;
  
  	wt_status_print_other_header(s, what, how);