Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate 'git merge'

This commit is contained in:
Steve Rowe 2018-06-20 10:16:12 -04:00
parent bcbcb16b6a
commit ee5aa87254
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev-tools/scripts/reproduceJenkinsFailures.py
View File

@ -167,9 +167,6 @@ def prepareWorkspace(useGit, gitRef):
code = run(checkoutBranchCmd)
if 0 != code:
raise RuntimeError('ERROR: "%s" failed. See above.' % checkoutBranchCmd)
code = run('git merge')
if 0 != code:
raise RuntimeError('ERROR: "git merge" failed. See above.')
gitCheckoutSucceeded = True
run('git merge --ff-only', rememberFailure=False) # Ignore failure on non-branch ref