From ca245cb3b6280efdc1c2227cab42e1d33b0d040c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 12 Jun 2010 00:44:01 +0200 Subject: [PATCH] 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 --- t/t7602-merge-octopus-many.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index 0a46795ae7..b02658bf77 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -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 octopus. 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 ' -- 2.11.4.GIT