rebase --autostash: demonstrate a problem with dirty submodules
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Oct 23, 2018 at 12:57 UTC
97bd162ca21dcc190327570ae8e6bd8a54582a23
1 file changed
+10
t/t3420-rebase-autostash.sh
+10
@@ -351,4 +351,14 @@ test_expect_success 'autostash is saved on editor failure with conflict' '
351
test_cmp expected file0
352
'
353
354
+test_expect_failure 'autostash with dirty submodules' '
355
+ test_when_finished "git reset --hard && git checkout master" &&
356
+ git checkout -b with-submodule &&
357
+ git submodule add ./ sub &&
358
+ test_tick &&
359
+ git commit -m add-submodule &&
360
+ echo changed >sub/file0 &&
361
+ git rebase -i --autostash HEAD
362
+'
363
+
364
test_done