diff options
Diffstat (limited to '.ci/scripts/merge/apply-patches-by-label-private.py')
| -rw-r--r-- | .ci/scripts/merge/apply-patches-by-label-private.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.ci/scripts/merge/apply-patches-by-label-private.py b/.ci/scripts/merge/apply-patches-by-label-private.py index fe0acd510..16b45043e 100644 --- a/.ci/scripts/merge/apply-patches-by-label-private.py +++ b/.ci/scripts/merge/apply-patches-by-label-private.py | |||
| @@ -25,7 +25,7 @@ def check_individual(repo_id, pr_id): | |||
| 25 | 25 | ||
| 26 | def merge_pr(pn, ref): | 26 | def merge_pr(pn, ref): |
| 27 | print("Matched PR# %s" % pn) | 27 | print("Matched PR# %s" % pn) |
| 28 | print(subprocess.check_output(["git", "fetch", "https://%sdev.azure.com/%s/_git/%s" % (user, org, repo), ref, "-f"])) | 28 | print(subprocess.check_output(["git", "fetch", "https://%sdev.azure.com/%s/_git/%s" % (user, org, repo), ref, "-f", "--no-recurse-submodules"])) |
| 29 | print(subprocess.check_output(["git", "merge", "--squash", 'origin/' + ref.replace('refs/heads/','')])) | 29 | print(subprocess.check_output(["git", "merge", "--squash", 'origin/' + ref.replace('refs/heads/','')])) |
| 30 | print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) | 30 | print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) |
| 31 | 31 | ||