Skip to content

Commit

Permalink
testdata: Fix non-default remotes
Browse files Browse the repository at this point in the history
Using refs/origin for fetching different remotes creates ambiguity
that prevents creating new tracking branches.
  • Loading branch information
fmuellner committed Dec 10, 2020
1 parent d6b8490 commit 37348fb
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions testdata/test.git/config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
fetch = +refs/heads/*:refs/remotes/origin/*
[remote "lab-testing"]
url = [email protected]:lab-testing/test.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/lab-testing/*

[branch "origin"]
remote = zaquestion
Expand All @@ -26,26 +26,26 @@
# https://git-scm.com/docs/git-clone#_git_urls_a_id_urls_a
[remote "origin-http"]
url = http://gitlab.com/zaquestion/test.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin-http/*
[remote "origin-https"]
url = https://gitlab.com/zaquestion/test.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin-https/*
[remote "origin-pushurl"]
url = garbageurl
pushurl = https://gitlab.com/zaquestion/test.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin-pushurl/*
[remote "origin-https-token"]
url = https://[email protected]/zaquestion/test.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin-https-token/*
[remote "origin-git"]
url = git://gitlab.com/zaquestion/test.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin-git/*
[remote "origin-ssh-alt"]
url = ssh://gitlab.com/zaquestion/test.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin-ssh-alt/*
[remote "origin-no_dot_git"]
url = [email protected]:zaquestion/test
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/heads/*:refs/remotes/origin-no_dot_git/*
[remote "garbage"]
url = garbageurl
fetch = +refs/heads/*:refs/remotes/garbage/*
Expand Down

0 comments on commit 37348fb

Please sign in to comment.