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>

diff --git a/setup.c b/setup.c
index 7f64f344770e5a783d6e131edeeafa58073fd7cb..0fdecec32e81852fe857f6f18ac620b543749685 100644 (file)
--- 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