diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:08:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:08:19 -0700 |
commit | a574c04fbfa06d9b40c4c32db27135c503da7c15 (patch) | |
tree | 13b9ee7c195f9aa80433e504d8fb8d569e26c5d9 /wt-status.c | |
parent | 632052641517de1a965c1f045b97d2eaa541b2e9 (diff) | |
parent | 69d61daec7a7915f6a664f32002fd9403e7f2a34 (diff) | |
download | git-a574c04fbfa06d9b40c4c32db27135c503da7c15.tar.gz git-a574c04fbfa06d9b40c4c32db27135c503da7c15.tar.xz |
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'
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 02377729c..c01838c5a 100644 --- a/wt-status.c +++ b/wt-status.c @@ -394,7 +394,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; init_pathspec(&rev.prune_data, s->pathspec); |