style: indent multiline "if" conditions to align

Commit 6dc905d974 (config: split repo scope to local and worktree,
2020-02-10) made some "if" statements multiline, but didn't indent the
second lines in our usual way.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index 593ce297ed2ad41e150a077b67623e12ceaa3d25..76838ed4d488af262ddd6170d1d9bc91c9b2b43c 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -370,7 +370,7 @@ static int handle_config(const char *key, const char *value, void *cb)
        remote = make_remote(name, namelen);
        remote->origin = REMOTE_CONFIG;
        if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
-       current_config_scope() == CONFIG_SCOPE_WORKTREE)
+           current_config_scope() == CONFIG_SCOPE_WORKTREE)
                remote->configured_in_repo = 1;
        if (!strcmp(subkey, "mirror"))
                remote->mirror = git_config_bool(key, value);

diff --git a/upload-pack.c b/upload-pack.c
index c53249cac19a33351f4f747782b71f877fc0692f..ac67af8b3f1a8f007cf07f763405a2f04bd51d9c 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1074,7 +1074,7 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
        }
 
        if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
-       current_config_scope() != CONFIG_SCOPE_WORKTREE) {
+           current_config_scope() != CONFIG_SCOPE_WORKTREE) {
                if (!strcmp("uploadpack.packobjectshook", var))
                        return git_config_string(&pack_objects_hook, var, value);
        }