Skip to content

Commit 1a5e30d

Browse files
committed
Make sure remote is always called "origin" when cloning git repo
1 parent f8bc50b commit 1a5e30d

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

modules/core/src/main/scala/org/scalasteward/core/git/FileGitAlg.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ final class FileGitAlg[F[_]](config: GitCfg)(implicit
5555
override def clone(repo: File, url: Uri): F[Unit] =
5656
for {
5757
rootDir <- workspaceAlg.rootDir
58-
_ <- git_("clone", url.toString, repo.pathAsString)(rootDir)
58+
_ <- git_("clone", "-c", "clone.defaultRemoteName=origin", url.toString, repo.pathAsString)(
59+
rootDir
60+
)
5961
} yield ()
6062

6163
override def cloneExists(repo: File): F[Boolean] =

modules/core/src/test/scala/org/scalasteward/core/forge/ForgeRepoAlgTest.scala

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@ class ForgeRepoAlgTest extends CatsEffectSuite {
3737
val expected = MockState.empty.copy(
3838
trace = Vector(
3939
Log("Clone scala-steward/datapackage"),
40-
Cmd(gitCmd(config.workspace), "clone", forkUrl, repoDir.toString),
40+
Cmd(
41+
gitCmd(config.workspace),
42+
"clone",
43+
"-c",
44+
"clone.defaultRemoteName=origin",
45+
forkUrl,
46+
repoDir.toString
47+
),
4148
Cmd(gitCmd(repoDir), "config", "user.email", "[email protected]"),
4249
Cmd(gitCmd(repoDir), "config", "user.name", "Bot Doe"),
4350
Log("Synchronize with fthomas/datapackage"),
@@ -64,7 +71,14 @@ class ForgeRepoAlgTest extends CatsEffectSuite {
6471
val expected = MockState.empty.copy(
6572
trace = Vector(
6673
Log("Clone fthomas/datapackage"),
67-
Cmd(gitCmd(config.workspace), "clone", parentUrl, repoDir.toString),
74+
Cmd(
75+
gitCmd(config.workspace),
76+
"clone",
77+
"-c",
78+
"clone.defaultRemoteName=origin",
79+
parentUrl,
80+
repoDir.toString
81+
),
6882
Cmd(gitCmd(repoDir), "config", "user.email", "[email protected]"),
6983
Cmd(gitCmd(repoDir), "config", "user.name", "Bot Doe"),
7084
Cmd(gitCmd(repoDir), "submodule", "update", "--init", "--recursive")

0 commit comments

Comments
 (0)