Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t4012: Re-indent test snippets
author
Alexander Strasser
<eclipse7@gmx.net>
Mon, 16 Jul 2012 20:45:40 +0000
(22:45 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 16 Jul 2012 20:50:50 +0000
(13:50 -0700)
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>
t/t4012-diff-binary.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
216f25f
)
diff --git
a/t/t4012-diff-binary.sh
b/t/t4012-diff-binary.sh
index 47677611873ab88f0f4f86803a83aefb7eba1d8f..7b0e759c74bac0fbff2a4bd7ec4c6f92df70e2c0 100755
(executable)
--- a/
t/t4012-diff-binary.sh
+++ b/
t/t4012-diff-binary.sh
@@
-16,12
+16,12
@@
cat >expect.binary-numstat <<\EOF
EOF
test_expect_success 'prepare repository' '
EOF
test_expect_success 'prepare repository' '
-
echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
-
git update-index --add a b c d &&
-
echo git >a &&
-
cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
-
echo git >c &&
-
cat b b >d
+ echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
+ git update-index --add a b c d &&
+ echo git >a &&
+ cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
+ echo git >c &&
+ 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
# in order to report the line number of a corrupt patch.
test_expect_success 'apply detecting corrupt patch correctly' '
# apply needs to be able to skip the binary material correctly
# in order to report the line number of a corrupt patch.
test_expect_success 'apply detecting corrupt patch correctly' '
-
git diff >output &&
-
sed -e "s/-CIT/xCIT/" <output >broken &&
-
if git apply --stat --summary broken 2>detected
-
then
+ git diff >output &&
+ sed -e "s/-CIT/xCIT/" <output >broken &&
+ if git apply --stat --summary broken 2>detected
+ then
echo unhappy - should have detected an error
(exit 1)
echo unhappy - should have detected an error
(exit 1)
-
else
+ else
echo happy
echo happy
-
fi &&
-
detected=`cat detected` &&
-
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
-
detected=`sed -ne "${detected}p" broken` &&
-
test "$detected" = xCIT
+ fi &&
+ detected=`cat detected` &&
+ detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
+ detected=`sed -ne "${detected}p" broken` &&
+ 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 &&
-
if git apply --stat --summary broken 2>detected
-
then
+ git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
+ if git apply --stat --summary broken 2>detected
+ then
echo unhappy - should have detected an error
(exit 1)
echo unhappy - should have detected an error
(exit 1)
-
else
+ else
echo happy
echo happy
-
fi &&
-
detected=`cat detected` &&
-
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
-
detected=`sed -ne "${detected}p" broken` &&
-
test "$detected" = xCIT
+ fi &&
+ detected=`cat detected` &&
+ detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
+ detected=`sed -ne "${detected}p" broken` &&
+ test "$detected" = xCIT
'
test_expect_success 'initial commit' 'git commit -a -m initial'
# Try removal (b), modification (d), and creation (e).
test_expect_success 'diff-index with --binary' '
'
test_expect_success 'initial commit' 'git commit -a -m initial'
# Try removal (b), modification (d), and creation (e).
test_expect_success 'diff-index with --binary' '
-
echo AIT >a && mv b e && echo CIT >c && cat e >d &&
-
git update-index --add --remove a b c d e &&
-
tree0=`git write-tree` &&
-
git diff --cached --binary >current &&
-
git apply --stat --summary current
+ echo AIT >a && mv b e && echo CIT >c && cat e >d &&
+ git update-index --add --remove a b c d e &&
+ tree0=`git write-tree` &&
+ git diff --cached --binary >current &&
+ git apply --stat --summary current
'
test_expect_success 'apply binary patch' '
'
test_expect_success 'apply binary patch' '
-
git reset --hard &&
-
git apply --binary --index <current &&
-
tree1=`git write-tree` &&
-
test "$tree1" = "$tree0"
+ git reset --hard &&
+ git apply --binary --index <current &&
+ tree1=`git write-tree` &&
+ test "$tree1" = "$tree0"
'
test_expect_success 'diff --no-index with binary creation' '
'
test_expect_success 'diff --no-index with binary creation' '