t4012: Re-indent test snippets
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>
Alexander Strasser committed
Jul 16, 2012 at 22:45 UTC
3e9cdf7fca90acd6efd380a2ed0d6801f33a46b7
1 file changed
+34
-34
t/t4012-diff-binary.sh
+34
-34
@@ -16,12 +16,12 @@ cat >expect.binary-numstat <<\EOF
16
EOF
17
18
test_expect_success 'prepare repository' '
19
- echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
20
- git update-index --add a b c d &&
21
- echo git >a &&
22
- cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
23
- echo git >c &&
24
- cat b b >d
19
+ echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
20
+ git update-index --add a b c d &&
21
+ echo git >a &&
22
+ cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
23
+ echo git >c &&
24
+ cat b b >d
25
'
26
27
cat > expected <<\EOF
@@ -64,52 +64,52 @@ test_expect_success 'apply --numstat understands diff --binary format' '
64
# apply needs to be able to skip the binary material correctly
65
# in order to report the line number of a corrupt patch.
66
test_expect_success 'apply detecting corrupt patch correctly' '
67
- git diff >output &&
68
- sed -e "s/-CIT/xCIT/" <output >broken &&
69
- if git apply --stat --summary broken 2>detected
70
- then
67
+ git diff >output &&
68
+ sed -e "s/-CIT/xCIT/" <output >broken &&
69
+ if git apply --stat --summary broken 2>detected
70
+ then
71
echo unhappy - should have detected an error
72
(exit 1)
73
- else
73
+ else
74
echo happy
75
- fi &&
76
- detected=`cat detected` &&
77
- detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
78
- detected=`sed -ne "${detected}p" broken` &&
79
- test "$detected" = xCIT
75
+ fi &&
76
+ detected=`cat detected` &&
77
+ detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
78
+ detected=`sed -ne "${detected}p" broken` &&
79
+ test "$detected" = xCIT
80
'
81
82
test_expect_success 'apply detecting corrupt patch correctly' '
83
- git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
84
- if git apply --stat --summary broken 2>detected
85
- then
83
+ git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
84
+ if git apply --stat --summary broken 2>detected
85
+ then
86
echo unhappy - should have detected an error
87
(exit 1)
88
- else
88
+ else
89
echo happy
90
- fi &&
91
- detected=`cat detected` &&
92
- detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
93
- detected=`sed -ne "${detected}p" broken` &&
94
- test "$detected" = xCIT
90
+ fi &&
91
+ detected=`cat detected` &&
92
+ detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
93
+ detected=`sed -ne "${detected}p" broken` &&
94
+ test "$detected" = xCIT
95
'
96
97
test_expect_success 'initial commit' 'git commit -a -m initial'
98
99
# Try removal (b), modification (d), and creation (e).
100
test_expect_success 'diff-index with --binary' '
101
- echo AIT >a && mv b e && echo CIT >c && cat e >d &&
102
- git update-index --add --remove a b c d e &&
103
- tree0=`git write-tree` &&
104
- git diff --cached --binary >current &&
105
- git apply --stat --summary current
101
+ echo AIT >a && mv b e && echo CIT >c && cat e >d &&
102
+ git update-index --add --remove a b c d e &&
103
+ tree0=`git write-tree` &&
104
+ git diff --cached --binary >current &&
105
+ git apply --stat --summary current
106
'
107
108
test_expect_success 'apply binary patch' '
109
- git reset --hard &&
110
- git apply --binary --index <current &&
111
- tree1=`git write-tree` &&
112
- test "$tree1" = "$tree0"
109
+ git reset --hard &&
110
+ git apply --binary --index <current &&
111
+ tree1=`git write-tree` &&
112
+ test "$tree1" = "$tree0"
113
'
114
115
test_expect_success 'diff --no-index with binary creation' '