Replace it with the equivalent gitconfig configuration, using the
results of the corresponding tests in t/t5505-remote.
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
t/t5515-fetch-merge-logic.sh | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index dbb927d..cde44e0 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -55,27 +55,25 @@ test_expect_success setup '
git config remote.config-glob.fetch refs/heads/*:refs/remotes/rem/* &&
remotes="$remotes config-glob" &&
- mkdir -p .git/remotes &&
- {
- echo "URL: ../.git/"
- echo "Pull: refs/heads/master:remotes/rem/master"
- echo "Pull: refs/heads/one:remotes/rem/one"
- echo "Pull: two:remotes/rem/two"
- echo "Pull: refs/heads/three:remotes/rem/three"
- } >.git/remotes/remote-explicit &&
+ git config remote.remote-explicit.url ../.git/ &&
+ git config remote.remote-explicit.fetch refs/heads/master:remotes/rem/master &&
+ git config --add remote.remote-explicit.fetch refs/heads/one:remotes/rem/one &&
+ git config --add remote.remote-explicit.fetch two:remotes/rem/two &&
+ git config --add remote.remote-explicit.fetch refs/heads/three:remotes/rem/three &&
remotes="$remotes remote-explicit" &&
- {
- echo "URL: ../.git/"
- echo "Pull: refs/heads/*:refs/remotes/rem/*"
- } >.git/remotes/remote-glob &&
+ git config remote.remote-glob.url ../.git/ &&
+ git config remote.remote-glob.fetch refs/heads/*:refs/remotes/rem/* &&
remotes="$remotes remote-glob" &&
- mkdir -p .git/branches &&
- echo "../.git" > .git/branches/branches-default &&
+ git config remote.branches-default.url ../.git/ &&
+ git config remote.branches-default.fetch refs/heads/master:refs/heads/branches-default &&
+ git config remote.branches-default.push HEAD:refs/heads/master &&
remotes="$remotes branches-default" &&
- echo "../.git#one" > .git/branches/branches-one &&
+ git config remote.branches-one.url ../.git/ &&
+ git config remote.branches-one.fetch refs/heads/one:refs/heads/branches-one &&
+ git config remote.branches-one.push HEAD:refs/heads/one &&
remotes="$remotes branches-one" &&
for remote in $remotes ; do
--
1.8.3.1.499.g7ad3486.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html