summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJacob Keller <jacob.keller@gmail.com>2017-04-13 17:12:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-18 02:04:16 (GMT)
commit2e5d6503bdc92260eae9c58b9fd1add7014bb853 (patch)
tree4ef9a62575c503270339318afa7a0e7bef73a860 /builtin
parent584f8975d2d9530a34bd0b936ae774f82fe30fed (diff)
downloadgit-2e5d6503bdc92260eae9c58b9fd1add7014bb853.zip
git-2e5d6503bdc92260eae9c58b9fd1add7014bb853.tar.gz
git-2e5d6503bdc92260eae9c58b9fd1add7014bb853.tar.bz2
ls-files: fix recurse-submodules with nested submodules
Since commit e77aa336f116 ("ls-files: optionally recurse into submodules", 2016-10-07) ls-files has known how to recurse into submodules when displaying files. Unfortunately this fails for certain cases, including when nesting more than one submodule, called from within a submodule that itself has submodules, or when the GIT_DIR environemnt variable is set. Prior to commit b58a68c1c187 ("setup: allow for prefix to be passed to git commands", 2017-03-17) this resulted in an error indicating that --prefix and --super-prefix were incompatible. After this commit, instead, the process loops forever with a GIT_DIR set to the parent and continuously reads the parent submodule files and recursing forever. Fix this by preparing the environment properly for submodules when setting up the child process. This is similar to how other commands such as grep behave. This was not caught by the original tests because the scenario is avoided if the submodules are created separately and not stored as the standard method of putting the submodule git directory under .git/modules/<name>. We can update the test to show the failure by the addition of "git submodule absorbgitdirs" to the test case. However, note that this new test would run forever without the necessary fix in this patch. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/ls-files.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index d449e46..e9b3546 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -15,6 +15,7 @@
#include "string-list.h"
#include "pathspec.h"
#include "run-command.h"
+#include "submodule.h"
static int abbrev;
static int show_deleted;
@@ -203,6 +204,9 @@ static void show_gitlink(const struct cache_entry *ce)
struct child_process cp = CHILD_PROCESS_INIT;
int status;
+ prepare_submodule_repo_env(&cp.env_array);
+ argv_array_push(&cp.env_array, GIT_DIR_ENVIRONMENT);
+
if (prefix_len)
argv_array_pushf(&cp.env_array, "%s=%s",
GIT_TOPLEVEL_PREFIX_ENVIRONMENT,