aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tools: size_compare_branches: allow use in detached-head state

Browse Source
This commit is contained in:
Peter Barker 2023-04-15 13:15:02 +10:00 committed by Peter Barker
parent 3b2e92c4d6
commit 8c92787e32
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/scripts/size_compare_branches.py
View File

@ -62,7 +62,7 @@ class SizeCompareBranches(object):
extra_hwdef_branch=[],
extra_hwdef_master=[]):
if branch is None:
branch = self.find_current_git_branch()
branch = self.find_current_git_branch_or_sha1()
self.master_branch = master_branch
self.branch = branch
@ -220,10 +220,18 @@ class SizeCompareBranches(object):
returncode, cmd_list)
return output
def find_current_git_branch(self):
def find_current_git_branch_or_sha1(self):
try:
output = self.run_git(["symbolic-ref", "--short", "HEAD"])
output = output.strip()
return output
except subprocess.CalledProcessError:
pass
# probably in a detached-head state. Get a sha1 instead:
output = self.run_git(["rev-parse", "--short", "HEAD"])
output = output.strip()
return output
def find_git_branch_merge_base(self, branch, master_branch):
output = self.run_git(["merge-base", branch, master_branch])