diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-11-07 14:00:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-08 01:16:38 (GMT) |
| commit | 176f5d965ba128f79a51d6c8d1620506672403e1 (patch) | |
| tree | 90c11373fb4e7bd39f062040119f7e43fb993aa2 /t | |
| parent | 2dac2bc843198c378b1f14dc9b7d3994cb240c97 (diff) | |
| download | git-176f5d965ba128f79a51d6c8d1620506672403e1.zip git-176f5d965ba128f79a51d6c8d1620506672403e1.tar.gz git-176f5d965ba128f79a51d6c8d1620506672403e1.tar.bz2 | |
built-in rebase --autostash: leave the current branch alone if possible
When we converted a `git reset --hard` call in the original Unix shell
script to built-in code, we asked to reset the worktree and the index
and explicitly *not* to detach the HEAD. By mistake, though, we still
did. Let's fix this.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index cc6149d..4e3d362 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -361,7 +361,7 @@ test_expect_success 'autostash with dirty submodules' ' git rebase -i --autostash HEAD ' -test_expect_failure 'branch is left alone when possible' ' +test_expect_success 'branch is left alone when possible' ' git checkout -b unchanged-branch && echo changed >file0 && git rebase --autostash unchanged-branch && |