Merge branch 'maint-1.7.4' into maint-1.7.5

* maint-1.7.4:
  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'

diff --cc Documentation/git-update-index.txt
index d3931294d174e5c06adb81e428e31e00fbfa3b5e,c30f8cd44b55f4f2ff5edadb070247d19b2400ad..a3081f4e237747dc858fd105302cbb9a489de41b
--- 1/Documentation/git-update-index.txt
--- 2/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@@ -363,8 -365,18 +365,9 @@@ ctime for marking files processed) (se
  SEE ALSO
  --------
  linkgit:git-config[1],
- linkgit:git-add[1]
+ linkgit:git-add[1],
+ linkgit:git-ls-files[1]
  
 -
 -Author
 -------
 -Written by Linus Torvalds <torvalds@osdl.org>
 -
 -Documentation
 ---------------
 -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
 -
  GIT
  ---
  Part of the linkgit:git[1] suite

diff --cc wt-status.c
index 9f4e0ba9c17120ca2903b30b95b6d8fbcc62cd9c,35020776b6fd4a4d1c585b2037dc193acf4e442d..227622d154f12540ddc3e231fbbcb831e07c0a77
--- 1/wt-status.c
--- 2/wt-status.c
+++ b/wt-status.c
@@@ -394,10 -320,10 +394,10 @@@ 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;
 -      rev.prune_data = s->pathspec;
 +      init_pathspec(&rev.prune_data, s->pathspec);
        run_diff_files(&rev, 0);
  }