diff --git a/Sources/AnalyticsGen/Providers/Forgejo/ForgejoRemoteRepoProvider.swift b/Sources/AnalyticsGen/Providers/Forgejo/ForgejoRemoteRepoProvider.swift index bceeeca..1e6ad2b 100644 --- a/Sources/AnalyticsGen/Providers/Forgejo/ForgejoRemoteRepoProvider.swift +++ b/Sources/AnalyticsGen/Providers/Forgejo/ForgejoRemoteRepoProvider.swift @@ -39,14 +39,15 @@ struct ForgejoRemoteRepoProvider: RemoteRepoProvider { Log.debug("Cloning repository...") switch ref { case .tag(let name), .branch(let name): - try shell("git clone --depth 1 -b \(name) \(gitRepositoryURL) \(repositoryPath)") - if ProcessInfo.processInfo.environment["ANALYTICS_GEN_EXPERIMENTAL_MERGE"] == "true" && ProcessInfo.processInfo.environment["CHANGE_TARGET"] == "develop" { Log.debug("Trying to merge master into user branch") + try shell("git clone -b \(name) \(gitRepositoryURL) \(repositoryPath)") try shell("cd \(repositoryPath) && git fetch --depth 1 origin refs/heads/master:refs/remotes/origin/master") - try shell("cd \(repositoryPath) && git merge origin/master --allow-unrelated-histories --no-edit") + try shell("cd \(repositoryPath) && git merge origin/master --no-edit") + } else { + try shell("git clone --depth 1 -b \(name) \(gitRepositoryURL) \(repositoryPath)") } case .commit(let sha): try shell("git clone \(gitRepositoryURL) \(repositoryPath)")