RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-21 02:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41464 from jdurgin/wip-bib

Browse Source 
script/build-integration-branch: always generate merge commits

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
This commit is contained in:
Yuri Weinstein 2021-05-21 08:34:21 -07:00 committed by GitHub
commit af54ba2d8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/build-integration-branch
View File

@ -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: