summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-05-01 19:10:12 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-01 11:01:47 -0700
commitec57a821a3bacdaaaf5eeba55a124bf1a502a13f (patch)
treed54a178874435a9b2d22f6a544452c9b274c6935
parentMerge branch 'ld/git-p4-tags-and-labels' (diff)
downloadtgif-ec57a821a3bacdaaaf5eeba55a124bf1a502a13f.tar.xz
test: modernize style of t4006
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4006-diff-mode.sh30
1 files changed, 14 insertions, 16 deletions
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index ff8c2f7532..b85f622e7c 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -8,23 +8,21 @@ test_description='Test mode change diffs.
'
. ./test-lib.sh
-test_expect_success \
- 'setup' \
- 'echo frotz >rezrov &&
- git update-index --add rezrov &&
- tree=`git write-tree` &&
- echo $tree'
+sed_script='s/\(:100644 100755\) \('"$_x40"'\) \2 /\1 X X /'
-test_expect_success \
- 'chmod' \
- 'test_chmod +x rezrov &&
- git diff-index $tree >current'
-
-sed -e 's/\(:100644 100755\) \('"$_x40"'\) \2 /\1 X X /' <current >check
-echo ":100644 100755 X X M rezrov" >expected
+test_expect_success 'setup' '
+ echo frotz >rezrov &&
+ git update-index --add rezrov &&
+ tree=`git write-tree` &&
+ echo $tree
+'
-test_expect_success \
- 'verify' \
- 'test_cmp expected check'
+test_expect_success 'chmod' '
+ test_chmod +x rezrov &&
+ git diff-index $tree >current &&
+ sed -e "$sed_script" <current >check &&
+ echo ":100644 100755 X X M rezrov" >expected &&
+ test_cmp expected check
+'
test_done