From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2017 03:14:30 +0000 (+0900)
Subject: Merge branch 'bw/rebase-i-ignored-submodule-fix'
X-Git-Tag: v2.16.0-rc0~131
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b50d82b00a8fc9d24e41ae7dc30185555f8fb0a0

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
---

b50d82b00a8fc9d24e41ae7dc30185555f8fb0a0
diff --cc wt-status.c
index 937a87bbd5,7346a89ef2..ef26f07446
--- a/wt-status.c
+++ b/wt-status.c
@@@ -2267,9 -2262,11 +2267,11 @@@ int has_unstaged_changes(int ignore_sub
  	int result;
  
  	init_revisions(&rev_info, NULL);
- 	if (ignore_submodules)
+ 	if (ignore_submodules) {
 -		DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
 -		DIFF_OPT_SET(&rev_info.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 +		rev_info.diffopt.flags.ignore_submodules = 1;
++		rev_info.diffopt.flags.override_submodule_config = 1;
+ 	}
 -	DIFF_OPT_SET(&rev_info.diffopt, QUICK);
 +	rev_info.diffopt.flags.quick = 1;
  	diff_setup_done(&rev_info.diffopt);
  	result = run_diff_files(&rev_info, 0);
  	return diff_result_code(&rev_info.diffopt, result);