mirror of
https://github.com/git/git.git
synced 2024-09-28 15:01:31 +02:00
Merge branch 'maint-1.7.3' into maint
* maint-1.7.3: Reindent closing bracket using tab instead of spaces
This commit is contained in:
commit
982d1dce34
@ -396,7 +396,7 @@ static void wt_status_collect_changes_worktree(struct wt_status *s)
|
|||||||
if (s->ignore_submodule_arg) {
|
if (s->ignore_submodule_arg) {
|
||||||
DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
|
DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
|
||||||
handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
|
handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
|
||||||
}
|
}
|
||||||
rev.diffopt.format_callback = wt_status_collect_changed_cb;
|
rev.diffopt.format_callback = wt_status_collect_changed_cb;
|
||||||
rev.diffopt.format_callback_data = s;
|
rev.diffopt.format_callback_data = s;
|
||||||
init_pathspec(&rev.prune_data, s->pathspec);
|
init_pathspec(&rev.prune_data, s->pathspec);
|
||||||
|
Loading…
Reference in New Issue
Block a user