mirror of
https://github.com/git/git.git
synced 2026-02-09 09:16:24 +00:00
Fix t3404 for Windows
The usual problem: CR/LF... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
@@ -817,7 +817,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
|
||||
'
|
||||
|
||||
|
||||
@@ -831,7 +831,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
|
||||
'
|
||||
|
||||
|
||||
@@ -845,7 +845,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
|
||||
'
|
||||
|
||||
|
||||
@@ -859,7 +859,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
|
||||
'
|
||||
|
||||
|
||||
@@ -874,7 +874,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
|
||||
'
|
||||
|
||||
|
||||
@@ -900,7 +900,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
|
||||
'
|
||||
|
||||
|
||||
@@ -919,7 +919,7 @@ test_expect_success 'rebase -i --exec without <CMD>' '
|
||||
test_must_fail git rebase -i --exec 2>tmp &&
|
||||
sed -e "1d" tmp >actual &&
|
||||
test_must_fail git rebase -h >expected &&
|
||||
test_cmp expected actual &&
|
||||
test_cmp_text expected actual &&
|
||||
git checkout master
|
||||
'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user