Skip to content

Bad idea to merge two branches without history #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BarabanovVVl merged 2 commits into from
Jul 31, 2025
Merged

Bad idea to merge two branches without history #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff312c1
Bad idea to merge two branches without history
Jul 31, 2025
3e8f870
Merge branch 'master' into branches-merge-fix
BarabanovVVl Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Sources/AnalyticsGen/Providers/Forgejo/ForgejoRemoteRepoProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)")
Expand Down
Loading