From 82f7a186a9ea615c908ef3085ecd68ac1ce3bc4bf6019bd552c38ef7d65bbf70 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 17 Mar 2025 17:58:51 +0100 Subject: [PATCH] Only cherry-pick non-merges --- devel-importer/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel-importer/main.go b/devel-importer/main.go index ce104a0..805e99e 100644 --- a/devel-importer/main.go +++ b/devel-importer/main.go @@ -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)