mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
t7602: cope with CR/LF
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:
parent
eb8fa8ca2c
commit
e40ee31109
|
@ -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
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue