diff options
| author | Jeff King <peff@peff.net> | 2020-12-03 09:00:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-03 19:32:32 +0100 |
| commit | 08e9df2395b1116ffe932eaedbc3c89676902362 (patch) | |
| tree | 8cc8aec806b43e4f5d0cdfb8991f5b4d67cf1a34 | |
| parent | config: add '--show-scope' to print the scope of a config value (diff) | |
| download | git-08e9df2395b1116ffe932eaedbc3c89676902362.tar.xz git-08e9df2395b1116ffe932eaedbc3c89676902362.zip | |
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>
| -rw-r--r-- | remote.c | 2 | ||||
| -rw-r--r-- | upload-pack.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 c53249cac1..ac67af8b3f 100644 --- 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); } |