diff mbox series

[1/2] rebase --autostash: demonstrate a problem with dirty submodules

Message ID 6d9ff59733e632f69ff414baaaa084dfd461b7e1.1540324633.git.gitgitgadget@gmail.com (mailing list archive)
State New, archived
Headers show
Series Demonstrate and fix a rebase --autostash bug with dirty submodules | expand

Commit Message

ZheNing Hu via GitGitGadget Oct. 23, 2018, 7:57 p.m. UTC
From: Johannes Schindelin <johannes.schindelin@gmx.de>

It has been reported that dirty submodules cause problems with the
built-in rebase when it is asked to autostash. The symptom is:

	fatal: Unexpected stash response: ''

This patch adds a regression test that demonstrates that bug.

Original report: https://github.com/git-for-windows/git/issues/1820

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t3420-rebase-autostash.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
diff mbox series

Patch

diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 0c4eefec7..7eb9f9041 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -351,4 +351,14 @@  test_expect_success 'autostash is saved on editor failure with conflict' '
 	test_cmp expected file0
 '
 
+test_expect_failure 'autostash with dirty submodules' '
+	test_when_finished "git reset --hard && git checkout master" &&
+	git checkout -b with-submodule &&
+	git submodule add ./ sub &&
+	test_tick &&
+	git commit -m add-submodule &&
+	echo changed >sub/file0 &&
+	git rebase -i --autostash HEAD
+'
+
 test_done