diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-10-23 12:57:16 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-24 13:38:13 +0900 |
| commit | 97bd162ca21dcc190327570ae8e6bd8a54582a23 (patch) | |
| tree | 08ca10947a13c8ddc90066b3f703facf84da5f67 | |
| parent | rebase (autostash): use an explicit OID to apply the stash (diff) | |
| download | tgif-97bd162ca21dcc190327570ae8e6bd8a54582a23.tar.xz | |
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>
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index e243700660..b6e18566b5 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 |