revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

added fallback for applying patch

Browse source
This commit is contained in:
Christian Kühnel 2019-10-21 22:41:37 +02:00
parent ac61475fe2
commit dddf48b57b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/phabtalk/apply_patch.py
View file

@ -37,7 +37,10 @@ def _get_parent_hash(diff_id: str, phab:Phabricator) -> str:
def _git_checkout(git_hash:str): def _git_checkout(git_hash:str):
try:
subprocess.check_call('git reset --hard {}'.format(git_hash), shell=True) subprocess.check_call('git reset --hard {}'.format(git_hash), shell=True)
except CalledProcessError:
subprocess.check_call('git checkout master')
subprocess.check_call('git clean -fdx', shell=True) subprocess.check_call('git clean -fdx', shell=True)