respect GIT_CEILING_DIRECTORIES

Ecordonnier · Ecordonnier · commit 979d79301da6 · 2025-02-13T18:23:57.000+01:00
Fix for #1103 When searching for the root-directory of the git repository e.g. with git rev-parse --show-toplevel, git stops the search when reaching $GIT_CEILING_DIRECTORIES. By ignoring this variable, the function _git_toplevel can go above the real git repository (e.g. when packaging a tarball without .git repository), and then runs "git archive" on an unrelated git repository. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
diff --git a/src/setuptools_scm/_file_finders/git.py b/src/setuptools_scm/_file_finders/git.py
@@ -72,6 +72,7 @@ def _git_ls_files_and_dirs(toplevel: str) -> tuple[set[str], set[str]]:
     # export-ignore git attribute
 
     cmd = ["git", "archive", "--prefix", toplevel + os.path.sep, "HEAD"]
+    log.info("running %s" % " ".join(str(x) for x in cmd))
     proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, cwd=toplevel, stderr=subprocess.DEVNULL
     )
diff --git a/src/setuptools_scm/_run_cmd.py b/src/setuptools_scm/_run_cmd.py
@@ -98,7 +98,7 @@ def no_git_env(env: Mapping[str, str]) -> dict[str, str]:
         k: v
         for k, v in env.items()
         if not k.startswith("GIT_")
-        or k in ("GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND")
+        or k in ("GIT_CEILING_DIRECTORIES", "GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND")
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ def _git_ls_files_and_dirs(toplevel: str) -> tuple[set[str], set[str]]:`
`72`	`72`	`# export-ignore git attribute`
`73`	`73`
`74`	`74`	`cmd = ["git", "archive", "--prefix", toplevel + os.path.sep, "HEAD"]`
	`75`	`+ log.info("running %s" % " ".join(str(x) for x in cmd))`
`75`	`76`	`proc = subprocess.Popen(`
`76`	`77`	`cmd, stdout=subprocess.PIPE, cwd=toplevel, stderr=subprocess.DEVNULL`
`77`	`78`	`)`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ def no_git_env(env: Mapping[str, str]) -> dict[str, str]:`
`98`	`98`	`k: v`
`99`	`99`	`for k, v in env.items()`
`100`	`100`	`if not k.startswith("GIT_")`
`101`		`- or k in ("GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND")`
	`101`	`+ or k in ("GIT_CEILING_DIRECTORIES", "GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND")`
`102`	`102`	`}`
`103`	`103`
`104`	`104`