diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-11-07 14:00:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-08 01:16:35 (GMT) |
| commit | 2dac2bc843198c378b1f14dc9b7d3994cb240c97 (patch) | |
| tree | 1bd8cfefbea2a45fd843a0d6f51c51a3a82232d7 /t | |
| parent | ffae8b2f904f0a82417ac24cb2684bbe5ca234e1 (diff) | |
| download | git-2dac2bc843198c378b1f14dc9b7d3994cb240c97.zip git-2dac2bc843198c378b1f14dc9b7d3994cb240c97.tar.gz git-2dac2bc843198c378b1f14dc9b7d3994cb240c97.tar.bz2 | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 001d624..cc6149d 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 |