diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-23 23:55:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-23 23:55:28 -0700 |
commit | f384a2edd62dfc4af0f051dc8248506cebb265f9 (patch) | |
tree | e7071046263e20258d6e666f6a079ee456313763 | |
parent | Merge branch 'maint' (diff) | |
parent | Merge branch 'maint-1.7.3' into maint (diff) | |
download | tgif-f384a2edd62dfc4af0f051dc8248506cebb265f9.tar.xz |
Merge branch 'maint'
* maint:
Reindent closing bracket using tab instead of spaces
-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 8836a527d0..70fdb76ff2 100644 --- a/wt-status.c +++ b/wt-status.c @@ -396,7 +396,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); |