summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-14 12:29:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-14 12:29:47 -0800
commit7fd92d9ed0255faf64ed78f02eadc902c7824008 (patch)
tree0d5eaf6c14aa0d0606f94253b8ff4de8a8c852a6 /t
parentGit 2.3.0-rc0 (diff)
parentAdd a regression test for 'git remote add <existing> <same-url>' (diff)
downloadtgif-7fd92d9ed0255faf64ed78f02eadc902c7824008.tar.xz
Merge branch 'js/remote-add-with-insteadof'
"git remote add $name $URL" is now allowed when "url.$URL.insteadOf" is already defined. * js/remote-add-with-insteadof: Add a regression test for 'git remote add <existing> <same-url>' git remote: allow adding remotes agreeing with url.<...>.insteadOf
Diffstat (limited to 't')
-rwxr-xr-xt/t5505-remote.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index ac79dd915d..17c6330f98 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -1113,4 +1113,9 @@ test_extra_arg set-url origin newurl oldurl
# prune takes any number of args
# update takes any number of args
+test_expect_success 'add remote matching the "insteadOf" URL' '
+ git config url.xyz@example.com.insteadOf backup &&
+ git remote add backup xyz@example.com
+'
+
test_done