blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/checkout_ref_branch' into 'master'

Browse Source 
bugfix: checkout ref failed for origin branches

See merge request espressif/esp-idf!16936
This commit is contained in:
Roland Dobai 2022-01-26 16:25:23 +00:00
commit 0ac6a105ef
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/ci/checkout_project_ref.py
View File

@ -86,10 +86,17 @@ if __name__ == '__main__':
for candidate in candidate_branches:
# check if the branch, tag or commit exists
try:
subprocess.check_call(['git', 'cat-file', '-t', candidate], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
subprocess.check_call(['git', 'cat-file', '-t', 'origin/{}'.format(candidate)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
ref_to_use = candidate
break
except subprocess.CalledProcessError:
try:
# For customized commits
subprocess.check_call(['git', 'cat-file', '-t', candidate], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
ref_to_use = candidate
break
except subprocess.CalledProcessError:
pass
continue
if ref_to_use: