Merge branch 'jk/multi-line-indent-style-fix'

Style fix.

* jk/multi-line-indent-style-fix:
  style: indent multiline "if" conditions to align

diff --cc remote.c
Simple merge

diff --cc upload-pack.c
index a856de1ce089b67dd61e56d7085f541dac4cb425,ac67af8b3f1a8f007cf07f763405a2f04bd51d9c..25e0ee1e0d6eb9d832b188f310749a90eb0a9382
--- 1/upload-pack.c
--- 2/upload-pack.c
+++ b/upload-pack.c
@@@ -1324,14 -1074,11 +1324,14 @@@ static int upload_pack_config(const cha
        }
  
        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);
 +                      return git_config_string(&data->pack_objects_hook, var, value);
        }
  
 +      if (parse_object_filter_config(var, value, data) < 0)
 +              return -1;
 +
        return parse_hide_refs_config(var, value, "uploadpack");
  }