48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From d51e1dff980b9fc87002436b6ab36120a39816b1 Mon Sep 17 00:00:00 2001
|
|
From: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
Date: Mon, 8 Aug 2022 13:27:46 +0000
|
|
Subject: [PATCH] setup: fix some formatting
|
|
|
|
In preparation for touching code that was introduced in 3b0bf2704980
|
|
(setup: tighten ownership checks post CVE-2022-24765, 2022-05-10) and
|
|
that was formatted differently than preferred in the Git project, fix
|
|
the indentation before actually modifying the code.
|
|
|
|
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
---
|
|
setup.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/setup.c b/setup.c
|
|
index 7f64f3447..0fdecec32 100644
|
|
--- a/setup.c
|
|
+++ b/setup.c
|
|
@@ -1138,7 +1138,7 @@ static int safe_directory_cb(const char *key, const char *value, void *d)
|
|
* added, for bare ones their git directory.
|
|
*/
|
|
static int ensure_valid_ownership(const char *gitfile,
|
|
- const char *worktree, const char *gitdir)
|
|
+ const char *worktree, const char *gitdir)
|
|
{
|
|
struct safe_directory_data data = {
|
|
.path = worktree ? worktree : gitdir
|
|
@@ -1271,10 +1271,11 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
|
|
strbuf_setlen(dir, offset);
|
|
if (gitdirenv) {
|
|
enum discovery_result ret;
|
|
+ const char *gitdir_candidate =
|
|
+ gitdir_path ? gitdir_path : gitdirenv;
|
|
|
|
- if (ensure_valid_ownership(gitfile,
|
|
- dir->buf,
|
|
- (gitdir_path ? gitdir_path : gitdirenv))) {
|
|
+ if (ensure_valid_ownership(gitfile, dir->buf,
|
|
+ gitdir_candidate)) {
|
|
strbuf_addstr(gitdir, gitdirenv);
|
|
ret = GIT_DIR_DISCOVERED;
|
|
} else
|
|
--
|
|
2.33.0
|
|
|