mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent a5e74b4baa 08e9df2395
commit 3c9f0df16a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
remote.c
View File

@ -355,7 +355,7 @@ static int handle_config(const char *key, const char *value, void *cb)
remote = make_remote(name, namelen); remote = make_remote(name, namelen);
remote->origin = REMOTE_CONFIG; remote->origin = REMOTE_CONFIG;
if (current_config_scope() == CONFIG_SCOPE_LOCAL || if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
current_config_scope() == CONFIG_SCOPE_WORKTREE) current_config_scope() == CONFIG_SCOPE_WORKTREE)
remote->configured_in_repo = 1; remote->configured_in_repo = 1;
if (!strcmp(subkey, "mirror")) if (!strcmp(subkey, "mirror"))
remote->mirror = git_config_bool(key, value); remote->mirror = git_config_bool(key, value);

2
upload-pack.c
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 && if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
current_config_scope() != CONFIG_SCOPE_WORKTREE) { current_config_scope() != CONFIG_SCOPE_WORKTREE) {
if (!strcmp("uploadpack.packobjectshook", var)) if (!strcmp("uploadpack.packobjectshook", var))
return git_config_string(&data->pack_objects_hook, var, value); return git_config_string(&data->pack_objects_hook, var, value);
} }