summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2017-01-06 17:22:23 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-07 19:30:08 -0800
commit2eb7a0e5e439f4249cd758ca728d5f054fa540bd (patch)
tree6206b363bb8e7370c283541f53c88f8dc3273ea8
parentrefname_is_safe(): correct docstring (diff)
downloadtgif-2eb7a0e5e439f4249cd758ca728d5f054fa540bd.tar.xz
t5505: use "for-each-ref" to test for the non-existence of references
Instead of looking on the filesystem inside ".git/refs/remotes/origin", use "git for-each-ref" to check for leftover references under the remote's old name. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5505-remote.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 8198d8eb05..65030fbc8a 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -725,7 +725,7 @@ test_expect_success 'rename a remote' '
(
cd four &&
git remote rename origin upstream &&
- rmdir .git/refs/remotes/origin &&
+ test -z "$(git for-each-ref refs/remotes/origin)" &&
test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&