mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-03 02:56:11 +02:00
Code

test: trivial cleanups 

No functional changes.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-05-28 07:54:29 -05:00 committed by Junio C Hamano
parent 7a97ee1d84
commit 15c7348eb0
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
t/t3403-rebase-skip.sh
View File

@ -64,10 +64,11 @@ test_expect_success 'rebase with --merge' '
test_expect_success 'rebase --skip with --merge' '
git rebase --skip
'
'
test_expect_success 'merge and reference trees equal' \
'test -z "`git diff-tree skip-merge skip-reference`"'
test_expect_success 'merge and reference trees equal' '
test -z "`git diff-tree skip-merge skip-reference`"
'
test_expect_success 'moved back to branch correctly' '
test refs/heads/skip-merge = $(git symbolic-ref HEAD)

18
t/t3505-cherry-pick-empty.sh
View File

@ -28,29 +28,21 @@ test_expect_success setup '
'
test_expect_success 'cherry-pick an empty commit' '
git checkout master && {
git cherry-pick empty-branch^
test "$?" = 1
}
git checkout master &&
test_expect_code 1 git cherry-pick empty-branch^
'
test_expect_success 'index lockfile was removed' '
test ! -f .git/index.lock
'
test_expect_success 'cherry-pick a commit with an empty message' '
git checkout master && {
git cherry-pick empty-branch
test "$?" = 1
}
git checkout master &&
test_expect_code 1 git cherry-pick empty-branch
'
test_expect_success 'index lockfile was removed' '
test ! -f .git/index.lock
'
test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' '
@ -101,7 +93,7 @@ test_expect_success 'cherry-pick a no-op with --keep-redundant' '
git reset --hard &&
git checkout fork^0 &&
git cherry-pick --keep-redundant-commits master &&
git show -s --format='%s' >actual &&
git show -s --format=%s >actual &&
echo "add file2 on master" >expect &&
test_cmp expect actual
'