Better naming of paths.

Kentzo · Aug 14, 2018 · 645c30a · 645c30a
1 parent 43431c4
commit 645c30a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/git_archive_all.py b/git_archive_all.py
@@ -245,18 +245,18 @@ def walk_git_files(self, repo_path=''):
                 m = re.match("^\s*path\s*=\s*(.*)\s*$", l)
 
                 if m:
-                    submodule_path = m.group(1)
-                    submodule_abspath = path.join(repo_path, submodule_path)
+                    repo_submodule_path = m.group(1)  # relative to repo_path
+                    main_repo_submodule_path = path.join(repo_path, repo_submodule_path)  # relative to main_repo_abspath
 
-                    if self.is_file_excluded(repo_abspath, submodule_path):
+                    if self.is_file_excluded(repo_abspath, repo_submodule_path):
                         continue
 
-                    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):
+                    for main_repo_submodule_file_path in self.walk_git_files(main_repo_submodule_path):
+                        repo_submodule_file_path = main_repo_submodule_file_path.replace(repo_path, "", 1).strip("/")
+                        if self.is_file_excluded(repo_abspath, repo_submodule_file_path):
                             continue
 
-                        yield submodule_file_path
+                        yield main_repo_submodule_file_path
         except IOError:
             pass