зеркало из https://github.com/microsoft/git.git
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:
Коммит
3c9f0df16a
2
remote.c
2
remote.c
|
@ -355,7 +355,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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче