Merge pull request #4339 from PetrKralCZ/20230830164846_new_pr_aPuvVKDsCe

Fix submodule filtering bug in `git_config`

Author: boegel

easybuild/tools/filetools.py

@@ -2683,11 +2683,13 @@ def get_source_tarball_from_git(filename, targetdir, git_config):
     # if a specific commit is asked for, check it out
     if commit:
         checkout_cmd = [git_cmd, 'checkout', commit]
-        if recursive:
-            checkout_cmd.extend(['&&', git_cmd, 'submodule', 'update', '--init', '--recursive'])
-        elif recurse_submodules:
+
+        if recursive or recurse_submodules:
             checkout_cmd.extend(['&&', git_cmd, 'submodule', 'update', '--init'])
-            checkout_cmd.extend(["--recurse-submodules='%s'" % pat for pat in recurse_submodules])
+            if recursive:
+                checkout_cmd.append('--recursive')
+            if recurse_submodules:
+                checkout_cmd.extend(["--recurse-submodules='%s'" % pat for pat in recurse_submodules])
 
         run.run_cmd(' '.join(checkout_cmd), log_all=True, simple=True, regexp=False, path=repo_name)
 

test/framework/filetools.py

@@ -2857,7 +2857,20 @@ def run_check():
         ]) % git_repo
         run_check()
 
+        git_config['recurse_submodules'] = ['!vcflib', '!sdsl-lite']
+        expected = '\n'.join([
+            r'  running command "git clone --no-checkout %(git_repo)s"',
+            r"  \(in .*/tmp.*\)",
+            '  running command "git checkout 8456f86 && git submodule update --init --recursive'
+            + ' --recurse-submodules=\'!vcflib\' --recurse-submodules=\'!sdsl-lite\'"',
+            r"  \(in testrepository\)",
+            r'  running command "tar cfvz .*/target/test.tar.gz --exclude .git testrepository"',
+            r"  \(in .*/tmp.*\)",
+        ]) % git_repo
+        run_check()
+
         del git_config['recursive']
+        del git_config['recurse_submodules']
         expected = '\n'.join([
             r'  running command "git clone --no-checkout %(git_repo)s"',
             r"  \(in .*/tmp.*\)",