[PATCH 2/5] setup: rename `die_upon_assumed_unsafe_repo()` to align with check
From: Michael Lohmann <hidden>
Date: 2025-10-13 09:42:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
This function dies if the repo in question is deemed to be unsafe and the ownership is only part of the verification. In addition it already checks for "safe.directory" config, making the name `ensure_valid_ownership()` not expressive. When additional options to check if a repository is considered to be safe are added, this name is more indicative of the content. Signed-off-by: Michael Lohmann <redacted> --- builtin/clone.c | 2 +- path.c | 4 ++-- setup.c | 2 +- setup.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index c990f398ef..6faf67dc68 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c@@ -263,7 +263,7 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest, * operation as the hardlinked files can be rewritten at will by the * potentially-untrusted user. We thus refuse to do so by default. */ - die_upon_dubious_ownership(NULL, NULL, src_repo); + die_upon_assumed_unsafe_repo(NULL, NULL, src_repo); mkdir_if_missing(dest->buf, 0777);
diff --git a/path.c b/path.c
index 7f56eaf993..254ba6c02f 100644
--- a/path.c
+++ b/path.c@@ -810,7 +810,7 @@ const char *enter_repo(const char *path, unsigned flags) return NULL; gitfile = read_gitfile(used_path.buf); if (!(flags & ENTER_REPO_ANY_OWNER_OK)) - die_upon_dubious_ownership(gitfile, NULL, used_path.buf); + die_upon_assumed_unsafe_repo(gitfile, NULL, used_path.buf); if (gitfile) { strbuf_reset(&used_path); strbuf_addstr(&used_path, gitfile);
@@ -822,7 +822,7 @@ const char *enter_repo(const char *path, unsigned flags) else { const char *gitfile = read_gitfile(path); if (!(flags & ENTER_REPO_ANY_OWNER_OK)) - die_upon_dubious_ownership(gitfile, NULL, path); + die_upon_assumed_unsafe_repo(gitfile, NULL, path); if (gitfile) path = gitfile; if (chdir(path))
diff --git a/setup.c b/setup.c
index 2c41874774..69f6d1b36c 100644
--- a/setup.c
+++ b/setup.c@@ -1333,7 +1333,7 @@ static int ensure_safe_repository(const char *gitfile, return data.is_safe; } -void die_upon_dubious_ownership(const char *gitfile, const char *worktree, +void die_upon_assumed_unsafe_repo(const char *gitfile, const char *worktree, const char *gitdir) { struct strbuf report = STRBUF_INIT, quoted = STRBUF_INIT;
diff --git a/setup.h b/setup.h
index 8522fa8575..25bd5f1e70 100644
--- a/setup.h
+++ b/setup.h@@ -51,7 +51,7 @@ const char *resolve_gitdir_gently(const char *suspect, int *return_error_code); * config settings; for non-bare repositories, their worktree needs to be * added, for bare ones their git directory. */ -void die_upon_dubious_ownership(const char *gitfile, const char *worktree, +void die_upon_assumed_unsafe_repo(const char *gitfile, const char *worktree, const char *gitdir); void setup_work_tree(void);
--
2.50.1 (Apple Git-155)