From: Junio C Hamano Date: Wed, 26 Oct 2011 23:08:14 +0000 (-0700) Subject: Merge branch 'maint-1.7.4' into maint-1.7.5 X-Git-Tag: v1.7.8-rc0~7^2~5^2~3^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=69d61daec7a7915f6a664f32002fd9403e7f2a34;p=git.git 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' --- 69d61daec7a7915f6a664f32002fd9403e7f2a34 diff --cc Documentation/git-update-index.txt index d3931294d,c30f8cd44..a3081f4e2 --- a/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 - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list . - GIT --- Part of the linkgit:git[1] suite diff --cc wt-status.c index 9f4e0ba9c,35020776b..227622d15 --- a/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); }