summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-24 06:55:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-24 06:55:28 (GMT)
commitf384a2edd62dfc4af0f051dc8248506cebb265f9 (patch)
treee7071046263e20258d6e666f6a079ee456313763
parent10b2a48113b8ab6b8f48229eb40fc3637ce025ae (diff)
parent982d1dce349732539780ee81bb79c8ab26eaed20 (diff)
downloadgit-f384a2edd62dfc4af0f051dc8248506cebb265f9.zip
git-f384a2edd62dfc4af0f051dc8248506cebb265f9.tar.gz
git-f384a2edd62dfc4af0f051dc8248506cebb265f9.tar.bz2
Merge branch 'maint'
* maint: Reindent closing bracket using tab instead of spaces
-rw-r--r--wt-status.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c
index 8836a52..70fdb76 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);