git-workflow/autogits
SHA256
19
0
Fork 8
Code Issues 43 Pull Requests 6 Projects 2 Activity

Only cherry-pick non-merges

Browse Source
This commit is contained in:
Adam Majer
2025-03-17 17:58:51 +01:00
parent 030fa43404
commit 82f7a186a9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devel-importer/main.go
View File

@@ -333,7 +333,7 @@ func importRepos(packages []string) {
}
if commit_tree[1] == tree {
found = true
cherry_picks := common.SplitStringNoEmpty(git.GitExecWithOutputOrPanic(pkgName, "rev-list", "--reverse", "--ancestry-path", commit_tree[0]+".."+import_branch), "\n")
cherry_picks := common.SplitStringNoEmpty(git.GitExecWithOutputOrPanic(pkgName, "rev-list", "--no-merges", "--reverse", "--ancestry-path", commit_tree[0]+".."+import_branch), "\n")
log.Println("cherry picks", cherry_picks)
git.GitExecOrPanic(pkgName, "checkout", "-B", "main", "pool/"+pool_branch)