diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-28 12:54:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-28 16:03:14 (GMT) |
| commit | 15c7348eb0731f33a65fb08a27979640d44a7a3d (patch) | |
| tree | c4bc5ba041ca773b782e864baae46aba0b697be1 /t/t3403-rebase-skip.sh | |
| parent | 7a97ee1d84283d0e59648531678bd69a895c78f5 (diff) | |
| download | git-15c7348eb0731f33a65fb08a27979640d44a7a3d.zip git-15c7348eb0731f33a65fb08a27979640d44a7a3d.tar.gz git-15c7348eb0731f33a65fb08a27979640d44a7a3d.tar.bz2 | |
test: trivial cleanups
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3403-rebase-skip.sh')
| -rwxr-xr-x | t/t3403-rebase-skip.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index 826500b..3968020 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -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) |