Browse Source

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>
maint
Jeff King 4 years ago committed by Junio C Hamano
parent
commit
08e9df2395
  1. 2
      remote.c
  2. 2
      upload-pack.c

2
remote.c

@ -370,7 +370,7 @@ static int handle_config(const char *key, const char *value, void *cb) @@ -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);

2
upload-pack.c

@ -1074,7 +1074,7 @@ static int upload_pack_config(const char *var, const char *value, void *unused) @@ -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);
}

Loading…
Cancel
Save