H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-03-28 16:33:17 +00:00
Code Releases Activity

Merge branch 'mz/empty-rebase-test' into maint-1.7.11

Browse Source 
* mz/empty-rebase-test:
  add tests for 'git rebase --keep-empty'
This commit is contained in:
Junio C Hamano 2012-09-11 11:08:48 -07:00
commit ef66ac3ead
1 changed files with 17 additions and 1 deletions

18
t/t3401-rebase-partial.sh

@ -47,7 +47,23 @@ test_expect_success 'rebase ignores empty commit' '
git commit --allow-empty -m empty && git commit --allow-empty -m empty &&
test_commit D && test_commit D &&
git rebase C && git rebase C &&
test $(git log --format=%s C..) = "D" test "$(git log --format=%s C..)" = "D"
'
test_expect_success 'rebase --keep-empty' '
git reset --hard D &&
git rebase --keep-empty C &&
test "$(git log --format=%s C..)" = "D
empty"
'
test_expect_success 'rebase --keep-empty keeps empty even if already in upstream' '
git reset --hard A &&
git commit --allow-empty -m also-empty &&
git rebase --keep-empty D &&
test "$(git log --format=%s A..)" = "also-empty
D
empty"
' '
test_done test_done