t1002: use -U0 instead of --unified=0
Using "-U0" is definitely more portable than using "--unified=0", so we should do that regardless. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds committed
May 25, 2006 at 22:41 UTC
c928c67d67f73f6bf8c427a187bc92a6d77bc731
1 file changed
+10
-10
t/t1002-read-tree-m-u-2way.sh
+10
-10
@@ -75,7 +75,7 @@ test_expect_success \
75
git-update-index --add yomin &&
76
git-read-tree -m -u $treeH $treeM &&
77
git-ls-files --stage >4.out || return 1
78
- diff --unified=0 M.out 4.out >4diff.out
78
+ diff -U0 M.out 4.out >4diff.out
79
compare_change 4diff.out expected &&
80
check_cache_at yomin clean &&
81
sum bozbar frotz nitfol >actual4.sum &&
@@ -94,7 +94,7 @@ test_expect_success \
94
echo yomin yomin >yomin &&
95
git-read-tree -m -u $treeH $treeM &&
96
git-ls-files --stage >5.out || return 1
97
- diff --unified=0 M.out 5.out >5diff.out
97
+ diff -U0 M.out 5.out >5diff.out
98
compare_change 5diff.out expected &&
99
check_cache_at yomin dirty &&
100
sum bozbar frotz nitfol >actual5.sum &&
@@ -112,7 +112,7 @@ test_expect_success \
112
git-update-index --add frotz &&
113
git-read-tree -m -u $treeH $treeM &&
114
git-ls-files --stage >6.out &&
115
- diff --unified=0 M.out 6.out &&
115
+ diff -U0 M.out 6.out &&
116
check_cache_at frotz clean &&
117
sum bozbar frotz nitfol >actual3.sum &&
118
cmp M.sum actual3.sum &&
@@ -129,7 +129,7 @@ test_expect_success \
129
echo frotz frotz >frotz &&
130
git-read-tree -m -u $treeH $treeM &&
131
git-ls-files --stage >7.out &&
132
- diff --unified=0 M.out 7.out &&
132
+ diff -U0 M.out 7.out &&
133
check_cache_at frotz dirty &&
134
sum bozbar frotz nitfol >actual7.sum &&
135
if cmp M.sum actual7.sum; then false; else :; fi &&
@@ -206,7 +206,7 @@ test_expect_success \
206
git-update-index --add nitfol &&
207
git-read-tree -m -u $treeH $treeM &&
208
git-ls-files --stage >14.out || return 1
209
- diff --unified=0 M.out 14.out >14diff.out
209
+ diff -U0 M.out 14.out >14diff.out
210
compare_change 14diff.out expected &&
211
sum bozbar frotz >actual14.sum &&
212
grep -v nitfol M.sum > expected14.sum &&
@@ -227,7 +227,7 @@ test_expect_success \
227
echo nitfol nitfol nitfol >nitfol &&
228
git-read-tree -m -u $treeH $treeM &&
229
git-ls-files --stage >15.out || return 1
230
- diff --unified=0 M.out 15.out >15diff.out
230
+ diff -U0 M.out 15.out >15diff.out
231
compare_change 15diff.out expected &&
232
check_cache_at nitfol dirty &&
233
sum bozbar frotz >actual15.sum &&
@@ -264,7 +264,7 @@ test_expect_success \
264
git-update-index --add bozbar &&
265
git-read-tree -m -u $treeH $treeM &&
266
git-ls-files --stage >18.out &&
267
- diff --unified=0 M.out 18.out &&
267
+ diff -U0 M.out 18.out &&
268
check_cache_at bozbar clean &&
269
sum bozbar frotz nitfol >actual18.sum &&
270
cmp M.sum actual18.sum'
@@ -278,7 +278,7 @@ test_expect_success \
278
echo gnusto gnusto >bozbar &&
279
git-read-tree -m -u $treeH $treeM &&
280
git-ls-files --stage >19.out &&
281
- diff --unified=0 M.out 19.out &&
281
+ diff -U0 M.out 19.out &&
282
check_cache_at bozbar dirty &&
283
sum frotz nitfol >actual19.sum &&
284
grep -v bozbar M.sum > expected19.sum &&
@@ -297,7 +297,7 @@ test_expect_success \
297
git-update-index --add bozbar &&
298
git-read-tree -m -u $treeH $treeM &&
299
git-ls-files --stage >20.out &&
300
- diff --unified=0 M.out 20.out &&
300
+ diff -U0 M.out 20.out &&
301
check_cache_at bozbar clean &&
302
sum bozbar frotz nitfol >actual20.sum &&
303
cmp M.sum actual20.sum'
@@ -338,7 +338,7 @@ test_expect_success \
338
git-update-index --add DF &&
339
git-read-tree -m -u $treeDF $treeDFDF &&
340
git-ls-files --stage >DFDFcheck.out &&
341
- diff --unified=0 DFDF.out DFDFcheck.out &&
341
+ diff -U0 DFDF.out DFDFcheck.out &&
342
check_cache_at DF/DF clean'
343
344
test_done