Merge pull request #41 from alehaa/bugfix/exclude-submodule

Fix two-layer excludes
Kentzo · Feb 13, 2018 · 16a79f7 · 16a79f7
2 parents 136c766 + b9a4d27
commit 16a79f7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/git_archive_all.py b/git_archive_all.py
@@ -326,13 +326,14 @@ def walk_git_files(self, repo_path=''):
 
                 if m:
                     submodule_path = m.group(1)
-                    submodule_path = path.join(repo_path, submodule_path)
+                    submodule_abspath = path.join(repo_path, submodule_path)
 
                     if self.is_file_excluded(repo_abspath, submodule_path, exclude_patterns):
                         continue
 
-                    for submodule_file_path in self.walk_git_files(submodule_path):
-                        if self.is_file_excluded(repo_abspath, submodule_file_path, exclude_patterns):
+                    for submodule_file_path in self.walk_git_files(submodule_abspath):
+                        rel_file_path = submodule_file_path.replace(repo_path, "", 1).strip("/")
+                        if self.is_file_excluded(repo_abspath, rel_file_path, exclude_patterns):
                             continue
 
                         yield submodule_file_path