summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-07 13:08:26 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-07 13:08:27 -0800
commit3d2c1bf2d44ccae8fc696263c771f9c53ca1576e (patch)
tree23c45fbccdbb991069a3e632daf591285a3eca8d /t
parent5095fa61e38c92cbc8c603880f04f0d6127ae72e (diff)
parent0e18a5b428920bdde28318d3b8e9d6d987729698 (diff)
downloadgit-3d2c1bf2d44ccae8fc696263c771f9c53ca1576e.tar.gz
Merge branch 'sb/t5400-remove-unused'
* sb/t5400-remove-unused: t5400: remove dead code
Diffstat (limited to 't')
-rwxr-xr-xt/t5400-send-pack.sh16
1 files changed, 1 insertions, 15 deletions
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 0736bcbcd5..04cea97f87 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -76,8 +76,7 @@ test_expect_success 'refuse pushing rewound head without --force' '
test "$victim_head" = "$pushed_head"
'
-test_expect_success \
- 'push can be used to delete a ref' '
+test_expect_success 'push can be used to delete a ref' '
( cd victim && git branch extra master ) &&
git send-pack ./victim :extra master &&
( cd victim &&
@@ -196,19 +195,6 @@ rewound_push_setup() {
)
}
-rewound_push_succeeded() {
- cmp ../parent/.git/refs/heads/master .git/refs/heads/master
-}
-
-rewound_push_failed() {
- if rewound_push_succeeded
- then
- false
- else
- true
- fi
-}
-
test_expect_success 'pushing explicit refspecs respects forcing' '
rewound_push_setup &&
parent_orig=$(cd parent && git rev-parse --verify master) &&