mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: t3404: Add test case for auto-amending only edited commits after "edit" t3404: Add test case for aborted --continue after "edit" t3501: check that commits are actually done
This commit is contained in:
commit
ebb7bbf769
|
@ -373,6 +373,38 @@ test_expect_success '--continue tries to commit, even for "edit"' '
|
||||||
test $parent = $(git rev-parse HEAD^)
|
test $parent = $(git rev-parse HEAD^)
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'aborted --continue does not squash commits after "edit"' '
|
||||||
|
old=$(git rev-parse HEAD) &&
|
||||||
|
test_tick &&
|
||||||
|
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
|
||||||
|
echo "edited again" > file7 &&
|
||||||
|
git add file7 &&
|
||||||
|
(
|
||||||
|
FAKE_COMMIT_MESSAGE=" " &&
|
||||||
|
export FAKE_COMMIT_MESSAGE &&
|
||||||
|
test_must_fail git rebase --continue
|
||||||
|
) &&
|
||||||
|
test $old = $(git rev-parse HEAD) &&
|
||||||
|
git rebase --abort
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'auto-amend only edited commits after "edit"' '
|
||||||
|
test_tick &&
|
||||||
|
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
|
||||||
|
echo "edited again" > file7 &&
|
||||||
|
git add file7 &&
|
||||||
|
FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
|
||||||
|
echo "and again" > file7 &&
|
||||||
|
git add file7 &&
|
||||||
|
test_tick &&
|
||||||
|
(
|
||||||
|
FAKE_COMMIT_MESSAGE="and again" &&
|
||||||
|
export FAKE_COMMIT_MESSAGE &&
|
||||||
|
test_must_fail git rebase --continue
|
||||||
|
) &&
|
||||||
|
git rebase --abort
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'rebase a detached HEAD' '
|
test_expect_success 'rebase a detached HEAD' '
|
||||||
grandparent=$(git rev-parse HEAD~2) &&
|
grandparent=$(git rev-parse HEAD~2) &&
|
||||||
git checkout $(git rev-parse HEAD) &&
|
git checkout $(git rev-parse HEAD) &&
|
||||||
|
|
|
@ -45,6 +45,7 @@ test_expect_success 'cherry-pick after renaming branch' '
|
||||||
|
|
||||||
git checkout rename2 &&
|
git checkout rename2 &&
|
||||||
git cherry-pick added &&
|
git cherry-pick added &&
|
||||||
|
test $(git rev-parse HEAD^) = $(git rev-parse rename2) &&
|
||||||
test -f opos &&
|
test -f opos &&
|
||||||
grep "Add extra line at the end" opos
|
grep "Add extra line at the end" opos
|
||||||
|
|
||||||
|
@ -54,6 +55,7 @@ test_expect_success 'revert after renaming branch' '
|
||||||
|
|
||||||
git checkout rename1 &&
|
git checkout rename1 &&
|
||||||
git revert added &&
|
git revert added &&
|
||||||
|
test $(git rev-parse HEAD^) = $(git rev-parse rename1) &&
|
||||||
test -f spoo &&
|
test -f spoo &&
|
||||||
! grep "Add extra line at the end" spoo
|
! grep "Add extra line at the end" spoo
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue