admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dl/merge-autostash-rebase-quit-fix'

Browse Source 
The stash entry created by "git rebase --autosquash" to keep the
initial dirty state were discarded by mistake upon "git rebase
--quit", which has been corrected.

* dl/merge-autostash-rebase-quit-fix:
  rebase: save autostash entry into stash reflog on --quit
This commit is contained in:
Junio C Hamano
2020-04-29 16:15:27 -07:00
parent bf10200871 9b2df3e8d0
commit 3afdeef33e
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
t/t3420-rebase-autostash.sh
View File

@@ -184,6 +184,26 @@ testrebase () {
git checkout feature-branch
'
test_expect_success "rebase$type: --quit" '
test_config rebase.autostash true &&
git reset --hard &&
git checkout -b rebased-feature-branch feature-branch &&
test_when_finished git branch -D rebased-feature-branch &&
echo dirty >>file3 &&
git diff >expect &&
test_must_fail git rebase$type related-onto-branch &&
test_path_is_file $dotest/autostash &&
test_path_is_missing file3 &&
git rebase --quit &&
test_when_finished git stash drop &&
test_path_is_missing $dotest/autostash &&
! grep dirty file3 &&
git stash show -p >actual &&
test_cmp expect actual &&
git reset --hard &&
git checkout feature-branch
'
test_expect_success "rebase$type: non-conflicting rebase, conflicting stash" '
test_config rebase.autostash true &&
git reset --hard &&