global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-22 15:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

t7602: cope with CR/LF

Browse Source 
The output of git-merge-octopus has CR/LF line endings, so let's just
strip the CR out.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2010-06-12 00:44:01 +02:00
committed by Karsten Blees
parent 24e40baef4
commit 63398066bb
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
t/t7602-merge-octopus-many.sh
View File

@@ -65,7 +65,8 @@ EOF
test_expect_success 'merge output uses pretty names' '
git reset --hard c1 &&
git merge c2 c3 c4 >actual &&
git merge c2 c3 c4 >actual.raw &&
tr -d "\r" < actual.raw > actual &&
test_cmp actual expected
'
@@ -79,7 +80,8 @@ Merge made by the 'octopus' strategy.
EOF
test_expect_success 'merge up-to-date output uses pretty names' '
git merge c4 c5 >actual &&
git merge c4 c5 >actual.raw &&
tr -d "\r" < actual.raw > actual &&
test_cmp actual expected
'
@@ -96,7 +98,8 @@ EOF
test_expect_success 'merge fast-forward output uses pretty names' '
git reset --hard c0 &&
git merge c1 c2 >actual &&
git merge c1 c2 >actual.raw &&
tr -d "\r" < actual.raw > actual &&
test_cmp actual expected
'