global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: trivial cleanups

Browse Source 
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
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)