Skip to content

Commit a4b0d2c

Browse files
authored
Merge pull request #2132 from EliahKagan/run-ci/overlap
Use `git config` to make overlapping remotes in a test repo
2 parents 2381693 + c8c84e4 commit a4b0d2c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed
Binary file not shown.

gix/tests/fixtures/make_remote_config_repos.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,15 @@ EOF
134134

135135
git clone fetch multiple-remotes
136136
(cd multiple-remotes
137-
git remote add other ../fetch && git fetch other
138-
git remote add with/two/slashes ../fetch && git fetch with/two/slashes
139-
git remote add with/two ../fetch && git fetch with/two
137+
git remote add other ../fetch
138+
git fetch other
139+
140+
git remote add with/two/slashes ../fetch
141+
git fetch with/two/slashes
142+
143+
git config remote.with/two.url ../fetch
144+
git config remote.with/two.fetch '+refs/heads/*:refs/remotes/with/two/*'
145+
git fetch with/two
140146

141147
# add a specialised refspec mapping
142148
git config --add remote.with/two.fetch +refs/heads/special:refs/remotes/with/two/special
@@ -146,4 +152,4 @@ git clone fetch multiple-remotes
146152
git checkout -b track-special with/two/special
147153
git checkout -b main --track origin/main
148154
git checkout -b other-main --track other/main
149-
)
155+
)

0 commit comments

Comments
 (0)