EdkRepo: Update includeifs in gitconfig

Changing includeif path syntax to be up-to-date with newer versions of Git Signed-off-by: Kevin Sun <[email protected]> Reviewed-by: Ashley E Desimone <[email protected]>
tianocore · May 17, 2022 · 1f3fbeb · 1f3fbeb
1 parent dcb0466
commit 1f3fbeb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/edkrepo/commands/sync_command.py b/edkrepo/commands/sync_command.py
@@ -479,7 +479,7 @@ def __check_submodule_config(self, workspace_path, manifest, repo_sources):
         gitglobalconfig = git.GitConfigParser(gitconfigpath, read_only=False)
         try:
             local_manifest_dir = os.path.join(workspace_path, "repo")
-            includeif_regex = re.compile('^includeIf "gitdir:(/.+)/"$')
+            includeif_regex = re.compile('^includeIf "gitdir:%\(prefix\)(/.+)/"$')
             rewrite_everything = False
             #Generate list of .gitconfig files that should be present in the workspace
             included_configs = []
@@ -515,7 +515,7 @@ def __check_submodule_config(self, workspace_path, manifest, repo_sources):
                             else:
                                 path = included_config[1]
                             path = path.replace('\\', '/')
-                            section = 'includeIf "gitdir:{}/"'.format(gitdir)
+                            section = 'includeIf "gitdir:%(prefix){}/"'.format(gitdir)
                             gitglobalconfig.add_section(section)
                             gitglobalconfig.set(section, 'path', path)
                             gitglobalconfig.release()

diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/common_repo_functions.py
@@ -194,7 +194,7 @@ def write_conditional_include(workspace_path, repo_sources, included_configs):
                 else:
                     path = included_config[1]
                 path = path.replace('\\', '/')
-                section = 'includeIf "gitdir:{}/"'.format(gitdir)
+                section = 'includeIf "gitdir:%(prefix){}/"'.format(gitdir)
                 with git.GitConfigParser(gitconfigpath, read_only=False) as gitglobalconfig:
                     gitglobalconfig.add_section(section)
                     gitglobalconfig.set(section, 'path', path)

diff --git a/edkrepo/common/workspace_maintenance/git_config_maintenance.py b/edkrepo/common/workspace_maintenance/git_config_maintenance.py
@@ -18,7 +18,8 @@
 def clean_git_globalconfig():
     global_gitconfig_path = os.path.normpath(expanduser("~/.gitconfig"))
     with git.GitConfigParser(global_gitconfig_path, read_only=False) as git_globalconfig:
-        includeif_regex = re.compile('^includeIf "gitdir:(/.+)/"$')
+        includeif_regex = re.compile('^includeIf "gitdir:%\(prefix\)(/.+)/"$')
+        includeif_regex_old = re.compile('^includeIf "gitdir:(/.+)/"$')
         for section in git_globalconfig.sections():
             data = includeif_regex.match(section)
             if data:
@@ -34,10 +35,14 @@ def clean_git_globalconfig():
                 if not os.path.isdir(gitrepo_path) and not os.path.isfile(gitconfig_path):
                     if not os.path.isfile(repo_manifest_path):
                         git_globalconfig.remove_section(section)
+
+            data_old = includeif_regex_old.match(section)
+            if data_old:
+                git_globalconfig.remove_section(section)
 
 def set_long_path_support():
     global_git_config_path = os.path.normpath(expanduser("~/.gitconfig"))
     with git.GitConfigParser(global_git_config_path, read_only=False) as git_globalconfig:
         if 'core' not in git_globalconfig.sections():
             git_globalconfig.add_section('core')
-        git_globalconfig.set('core', 'longpaths', 'true')
+        git_globalconfig.set('core', 'longpaths', 'true')