global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-14 11:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix t3404 for Windows

Browse Source 
The usual problem: CR/LF...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2012-12-04 00:17:45 -06:00
committed by Pat Thoyts
parent 8b097505b1
commit 694fb7247b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
t/t3404-rebase-interactive.sh
View File

@@ -784,7 +784,7 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' '
git rebase -i HEAD~2 >expect git rebase -i HEAD~2 >expect
) && ) &&
sed -e "1,9d" expect >expected && sed -e "1,9d" expect >expected &&
test_cmp expected actual test_cmp_text expected actual
' '
@@ -797,7 +797,7 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' '
git rebase -i HEAD~2 >expect git rebase -i HEAD~2 >expect
) && ) &&
sed -e "1,9d" expect >expected && sed -e "1,9d" expect >expected &&
test_cmp expected actual test_cmp_text expected actual
' '
@@ -810,7 +810,7 @@ test_expect_success 'running "git rebase -ix git show HEAD"' '
git rebase -i HEAD~2 >expect git rebase -i HEAD~2 >expect
) && ) &&
sed -e "1,9d" expect >expected && sed -e "1,9d" expect >expected &&
test_cmp expected actual test_cmp_text expected actual
' '
@@ -823,7 +823,7 @@ test_expect_success 'rebase -ix with several <CMD>' '
git rebase -i HEAD~2 >expect git rebase -i HEAD~2 >expect
) && ) &&
sed -e "1,9d" expect >expected && sed -e "1,9d" expect >expected &&
test_cmp expected actual test_cmp_text expected actual
' '
@@ -837,7 +837,7 @@ test_expect_success 'rebase -ix with several instances of --exec' '
git rebase -i HEAD~2 >expect git rebase -i HEAD~2 >expect
) && ) &&
sed -e "1,11d" expect >expected && sed -e "1,11d" expect >expected &&
test_cmp expected actual test_cmp_text expected actual
' '
@@ -862,7 +862,7 @@ test_expect_success 'rebase -ix with --autosquash' '
git rebase -i HEAD~4 >expect git rebase -i HEAD~4 >expect
) && ) &&
sed -e "1,13d" expect >expected && sed -e "1,13d" expect >expected &&
test_cmp expected actual test_cmp_text expected actual
' '