summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-24 06:55:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-24 06:55:22 (GMT)
commit982d1dce349732539780ee81bb79c8ab26eaed20 (patch)
tree812ca0b31def20873db8635263b99d84f0aea105 /wt-status.c
parentf7d958dff5e194797ef6776bcc77c1349f9f8c81 (diff)
parentc4c42f2cbd2eb14871881cc0d27412b477f699a7 (diff)
downloadgit-982d1dce349732539780ee81bb79c8ab26eaed20.zip
git-982d1dce349732539780ee81bb79c8ab26eaed20.tar.gz
git-982d1dce349732539780ee81bb79c8ab26eaed20.tar.bz2
Merge branch 'maint-1.7.3' into maint
* maint-1.7.3: Reindent closing bracket using tab instead of spaces
Diffstat (limited to 'wt-status.c')
-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);