rebase --autostash: fix issue with dirty submodules

dscho · gitster · commit ffae8b2f904f · 2018-10-24T13:38:15.000+09:00
Since we cannot stash dirty submodules, there is no use in requiring them to be clean (or stash them when they are not). This brings the built-in rebase in line with the previous, scripted version, which also did not care about dirty submodules (but it was admittedly not very easy to figure that out). This fixes git-for-windows#1820 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/rebase.c b/builtin/rebase.c
@@ -1350,7 +1350,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			update_index_if_able(&the_index, &lock_file);
 		rollback_lock_file(&lock_file);
 
-		if (has_unstaged_changes(0) || has_uncommitted_changes(0)) {
+		if (has_unstaged_changes(1) || has_uncommitted_changes(1)) {
 			const char *autostash =
 				state_dir_path("autostash", &options);
 			struct child_process stash = CHILD_PROCESS_INIT;
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
@@ -351,7 +351,7 @@ test_expect_success 'autostash is saved on editor failure with conflict' '
 	test_cmp expected file0
 '
 
-test_expect_failure 'autostash with dirty submodules' '
+test_expect_success 'autostash with dirty submodules' '
 	test_when_finished "git reset --hard && git checkout master" &&
 	git checkout -b with-submodule &&
 	git submodule add ./ sub &&

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ test_expect_success 'autostash is saved on editor failure with conflict' '`
`351`	`351`	`test_cmp expected file0`
`352`	`352`	`'`
`353`	`353`
`354`		`-test_expect_failure 'autostash with dirty submodules' '`
	`354`	`+test_expect_success 'autostash with dirty submodules' '`
`355`	`355`	`test_when_finished "git reset --hard && git checkout master" &&`
`356`	`356`	`git checkout -b with-submodule &&`
`357`	`357`	`git submodule add ./ sub &&`