undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4012: Re-indent test snippets

Browse Source 
Most one-level indents were 1 HT (horizontal tab) followed by 1 SP.
Remove the SP.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexander Strasser 2012-07-16 22:45:40 +02:00 committed by Junio C Hamano
parent 216f25f65f
commit 3e9cdf7fca
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
t/t4012-diff-binary.sh
View File

@ -16,12 +16,12 @@ cat >expect.binary-numstat <<\EOF
EOF EOF
test_expect_success 'prepare repository' ' test_expect_success 'prepare repository' '
echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d && echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
git update-index --add a b c d && git update-index --add a b c d &&
echo git >a && echo git >a &&
cat "$TEST_DIRECTORY"/test-binary-1.png >b && cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
echo git >c && echo git >c &&
cat b b >d cat b b >d
' '
cat > expected <<\EOF cat > expected <<\EOF
@ -64,52 +64,52 @@ test_expect_success 'apply --numstat understands diff --binary format' '
# apply needs to be able to skip the binary material correctly # apply needs to be able to skip the binary material correctly
# in order to report the line number of a corrupt patch. # in order to report the line number of a corrupt patch.
test_expect_success 'apply detecting corrupt patch correctly' ' test_expect_success 'apply detecting corrupt patch correctly' '
git diff >output && git diff >output &&
sed -e "s/-CIT/xCIT/" <output >broken && sed -e "s/-CIT/xCIT/" <output >broken &&
if git apply --stat --summary broken 2>detected if git apply --stat --summary broken 2>detected
then then
echo unhappy - should have detected an error echo unhappy - should have detected an error
(exit 1) (exit 1)
else else
echo happy echo happy
fi && fi &&
detected=`cat detected` && detected=`cat detected` &&
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
detected=`sed -ne "${detected}p" broken` && detected=`sed -ne "${detected}p" broken` &&
test "$detected" = xCIT test "$detected" = xCIT
' '
test_expect_success 'apply detecting corrupt patch correctly' ' test_expect_success 'apply detecting corrupt patch correctly' '
git diff --binary | sed -e "s/-CIT/xCIT/" >broken && git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
if git apply --stat --summary broken 2>detected if git apply --stat --summary broken 2>detected
then then
echo unhappy - should have detected an error echo unhappy - should have detected an error
(exit 1) (exit 1)
else else
echo happy echo happy
fi && fi &&
detected=`cat detected` && detected=`cat detected` &&
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
detected=`sed -ne "${detected}p" broken` && detected=`sed -ne "${detected}p" broken` &&
test "$detected" = xCIT test "$detected" = xCIT
' '
test_expect_success 'initial commit' 'git commit -a -m initial' test_expect_success 'initial commit' 'git commit -a -m initial'
# Try removal (b), modification (d), and creation (e). # Try removal (b), modification (d), and creation (e).
test_expect_success 'diff-index with --binary' ' test_expect_success 'diff-index with --binary' '
echo AIT >a && mv b e && echo CIT >c && cat e >d && echo AIT >a && mv b e && echo CIT >c && cat e >d &&
git update-index --add --remove a b c d e && git update-index --add --remove a b c d e &&
tree0=`git write-tree` && tree0=`git write-tree` &&
git diff --cached --binary >current && git diff --cached --binary >current &&
git apply --stat --summary current git apply --stat --summary current
' '
test_expect_success 'apply binary patch' ' test_expect_success 'apply binary patch' '
git reset --hard && git reset --hard &&
git apply --binary --index <current && git apply --binary --index <current &&
tree1=`git write-tree` && tree1=`git write-tree` &&
test "$tree1" = "$tree0" test "$tree1" = "$tree0"
' '
test_expect_success 'diff --no-index with binary creation' ' test_expect_success 'diff --no-index with binary creation' '