Skip to content

Commit

Permalink
Fix t3404 for Windows
Browse files Browse the repository at this point in the history
The usual problem: CR/LF...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho authored and patthoyts committed May 29, 2013
1 parent 187787c commit 5526086
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions t/t3404-rebase-interactive.sh
Expand Up @@ -778,7 +778,7 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,9d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -791,7 +791,7 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,9d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -804,7 +804,7 @@ test_expect_success 'running "git rebase -ix git show HEAD"' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,9d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -817,7 +817,7 @@ test_expect_success 'rebase -ix with several <CMD>' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,9d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -831,7 +831,7 @@ test_expect_success 'rebase -ix with several instances of --exec' '
git rebase -i HEAD~2 >expect
) &&
sed -e "1,11d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand All @@ -856,7 +856,7 @@ test_expect_success 'rebase -ix with --autosquash' '
git rebase -i HEAD~4 >expect
) &&
sed -e "1,13d" expect >expected &&
test_cmp expected actual
test_cmp_text expected actual
'


Expand Down

0 comments on commit 5526086

Please sign in to comment.