Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ea2aaaee authored by Adrian DC's avatar Adrian DC
Browse files

build: repopick: Avoid failing on commits lookup 

 * Some projects with multiple merges and
    discountinuous histories could trigger
    an error here when the HEAD~{?} does
    not exist, hence avoid this by ignoring
    the commit and continue the search

Change-Id: Ice28c87d1bf8897da52236b637bbb0c5d349f848
parent 86152e68

tools/repopick.py

+2 −0
Original line number Diff line number Diff line
@@ -328,6 +328,8 @@ if __name__ == '__main__': 
        # Check if change is already picked to HEAD...HEAD~check_picked_count

        found_change = False

        for i in range(0, check_picked_count):

            if subprocess.call(['git', 'cat-file', '-e', 'HEAD~{0}'.format(i)], cwd=project_path, stderr=open(os.devnull, 'wb')):

                continue

            output = subprocess.check_output(['git', 'show', '-q', 'HEAD~{0}'.format(i)], cwd=project_path).split()

            if 'Change-Id:' in output:

                head_change_id = ''