mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 15:03:53 +01:00
Code

Merge branch 'ps/rebase-i-auto-unstash-upon-abort'

Browse Source 
"git rebase -i --autostash" did not restore the auto-stashed change
when the operation was aborted.

* ps/rebase-i-auto-unstash-upon-abort:
  rebase -i: restore autostash on abort
This commit is contained in:
Junio C Hamano 2016-07-13 11:24:16 -07:00
commit 5eb1e9f1a0
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-rebase--interactive.sh
View File

@ -212,6 +212,7 @@ Once you are satisfied with your changes, run
}
die_abort () {
apply_autostash
rm -rf "$state_dir"
die "$1"
}

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

@ -192,4 +192,35 @@ test_expect_success 'abort rebase -i with --autostash' '
test_cmp expected file0
'
test_expect_success 'restore autostash on editor failure' '
test_when_finished "git reset --hard" &&
echo uncommitted-content >file0 &&
(
test_set_editor "false" &&
test_must_fail git rebase -i --autostash HEAD^
) &&
echo uncommitted-content >expected &&
test_cmp expected file0
'
test_expect_success 'autostash is saved on editor failure with conflict' '
test_when_finished "git reset --hard" &&
echo uncommitted-content >file0 &&
(
write_script abort-editor.sh <<-\EOF &&
echo conflicting-content >file0
exit 1
EOF
test_set_editor "$(pwd)/abort-editor.sh" &&
test_must_fail git rebase -i --autostash HEAD^ &&
rm -f abort-editor.sh
) &&
echo conflicting-content >expected &&
test_cmp expected file0 &&
git checkout file0 &&
git stash pop &&
echo uncommitted-content >expected &&
test_cmp expected file0
'
test_done