From: Johannes Schindelin Date: Wed, 7 Nov 2018 14:00:48 +0000 (-0800) Subject: built-in rebase: demonstrate regression with --autostash X-Git-Tag: v2.20.0-rc0~19^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2dac2bc843198c378b1f14dc9b7d3994cb240c97;p=git built-in rebase: demonstrate regression with --autostash An unnamed colleague of Ævar Arnfjörð Bjarmason reported a breakage where a `pull --rebase` (which did not really need to do anything but stash, see that nothing was changed, and apply the stash again) also detached the HEAD. This patch adds a minimal reproducer for this regression. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 001d6243c9..cc6149d53f 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -361,4 +361,12 @@ test_expect_success 'autostash with dirty submodules' ' git rebase -i --autostash HEAD ' +test_expect_failure 'branch is left alone when possible' ' + git checkout -b unchanged-branch && + echo changed >file0 && + git rebase --autostash unchanged-branch && + test changed = "$(cat file0)" && + test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)" +' + test_done