Commit 8940b51b2a573f8ab530614803bddbfe16a0a81d
2019-08-07T12:07:50
remove test_checkout_sets_xbit duplicate added in previous
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/regress/cmdline/checkout.sh b/regress/cmdline/checkout.sh
index 691d705..2f03e3f 100755
--- a/regress/cmdline/checkout.sh
+++ b/regress/cmdline/checkout.sh
@@ -172,41 +172,6 @@ function test_checkout_sets_xbit {
test_done "$testroot" "$ret"
}
-function test_checkout_sets_xbit {
- local testroot=`test_init checkout_sets_xbit 1`
-
- touch $testroot/repo/xfile
- chmod +x $testroot/repo/xfile
- (cd $testroot/repo && git add .)
- git_commit $testroot/repo -m "adding executable file"
-
- echo "A $testroot/wt/xfile" > $testroot/stdout.expected
- echo "Now shut up and hack" >> $testroot/stdout.expected
-
- got checkout $testroot/repo $testroot/wt > $testroot/stdout
- ret="$?"
- if [ "$ret" != "0" ]; then
- test_done "$testroot" "$ret"
- return 1
- fi
-
- cmp -s $testroot/stdout.expected $testroot/stdout
- ret="$?"
- if [ "$ret" != "0" ]; then
- diff -u $testroot/stdout.expected $testroot/stdout
- test_done "$testroot" "$ret"
- return 1
- fi
-
- ls -l $testroot/wt/xfile | grep -q '^-rwx'
- ret="$?"
- if [ "$ret" != "0" ]; then
- echo "file is not executable" >&2
- ls -l $testroot/wt/xfile >&2
- fi
- test_done "$testroot" "$ret"
-}
-
function test_checkout_commit_from_wrong_branch {
local testroot=`test_init checkout_commit_from_wrong_branch`