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

Style fix.

* jk/multi-line-indent-style-fix:
  style: indent multiline "if" conditions to align
This commit is contained in:
Junio C Hamano
2020-12-14 10:21:38 -08:00
2 changed files with 2 additions and 2 deletions

View File

@ -1324,7 +1324,7 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
}
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(&data->pack_objects_hook, var, value);
}