diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:08:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:08:08 -0700 |
commit | ed36a48e6d246f4f60d44b27e8c1e660151cd0b4 (patch) | |
tree | e0b4b25edee7aec9592650055c3659a659d1d9ac /wt-status.c | |
parent | completion: replace core.abbrevguard to core.abbrev (diff) | |
parent | Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3 (diff) | |
download | tgif-ed36a48e6d246f4f60d44b27e8c1e660151cd0b4.tar.xz |
Merge branch 'maint-1.7.3' into maint-1.7.4
* maint-1.7.3:
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'
Diffstat (limited to 'wt-status.c')
-rw-r--r-- | wt-status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 123582b6cb..35020776b6 100644 --- a/wt-status.c +++ b/wt-status.c @@ -320,7 +320,7 @@ static void wt_status_collect_changes_worktree(struct wt_status *s) 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; |