From c7bac195879a1cc30788585e029aca5fb11c1571 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 20 May 2021 19:28:25 -0400 Subject: [PATCH] script/build-integration-branch: always generate merge commits This guarantees we'll always get a new sha1, so shaman will generate a new build even if the same PRs are pushed to more than one branch. Signed-off-by: Josh Durgin --- src/script/build-integration-branch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/build-integration-branch b/src/script/build-integration-branch index 0450f6a3411..9ff5b4e3e63 100755 --- a/src/script/build-integration-branch +++ b/src/script/build-integration-branch @@ -94,7 +94,7 @@ for pr in prs: pr_ref = pr['head']['ref'] print(f'--- pr {pr_number} --- pulling {pr_url} branch {pr_ref}') while True: - r = call(['git', 'pull', '--no-edit', pr_url, pr_ref]) + r = call(['git', 'pull', '--no-ff', '--no-edit', pr_url, pr_ref]) if r == 0: break elif r == 1: -- 2.39.5