diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:14:30 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:14:30 +0900 |
| commit | b50d82b00a8fc9d24e41ae7dc30185555f8fb0a0 (patch) | |
| tree | 626a7714e775c440ea15e74583ff1f163ff20186 /wt-status.c | |
| parent | a97222978ab3e0e86e87dccacf59269a9060de9e (diff) | |
| parent | c6d8ccf3a25556e1cac99433721e3c05ba970d89 (diff) | |
| download | git-b50d82b00a8fc9d24e41ae7dc30185555f8fb0a0.tar.gz | |
Merge branch 'bw/rebase-i-ignored-submodule-fix'
"git rebase -i" recently started misbehaving when a submodule that
is configured with 'submodule.<name>.ignore' is dirty; this has
been corrected.
* bw/rebase-i-ignored-submodule-fix:
wt-status: actually ignore submodules when requested
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 937a87bbd5..ef26f07446 100644 --- a/wt-status.c +++ b/wt-status.c @@ -2267,8 +2267,10 @@ int has_unstaged_changes(int ignore_submodules) int result; init_revisions(&rev_info, NULL); - if (ignore_submodules) + if (ignore_submodules) { rev_info.diffopt.flags.ignore_submodules = 1; + rev_info.diffopt.flags.override_submodule_config = 1; + } rev_info.diffopt.flags.quick = 1; diff_setup_done(&rev_info.diffopt); result = run_diff_files(&rev_info, 0); |