dynamic branch json file corruption during edkrepo sync

tianocore#123 When determining branch collision, the patchset parent_sha value should not match the branch name. If the patchset parent_sha value matches the branch name, continue testing the remaining patchsets. Signed-off-by: Nathaniel Haller <[email protected]> Reviewed-by: Ashley E Desimone <[email protected]>
ashedesimone · Feb 28, 2023 · 85cb6a3 · 85cb6a3
1 parent b418f74
commit 85cb6a3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/common_repo_functions.py
@@ -433,6 +433,9 @@ def is_branch_name_collision(json_path, patchset_obj, repo, global_manifest_path
                 data = json.load(f)
                 patchset_data = data[repo_name]
                 for patchset in patchset_data:
+                    if patchset_name == patchset['parent_sha']:
+                        # Do not match a patchset branch name against a daisy-chained-patchset parent_sha value
+                        continue
                     if patchset_name in patchset.values():
                         BRANCH_IN_JSON = True