diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-12-14 10:21:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-14 10:21:38 -0800 |
| commit | 3c9f0df16a20071aa6810152dd7f4003f3d96c4b (patch) | |
| tree | a6f870082686ba67f103da752cc8a8e932c7d8f7 | |
| parent | Merge branch 'jk/check-config-parsing-error-in-upload-pack' (diff) | |
| parent | style: indent multiline "if" conditions to align (diff) | |
| download | tgif-3c9f0df16a20071aa6810152dd7f4003f3d96c4b.tar.xz | |
Merge branch 'jk/multi-line-indent-style-fix'
Style fix.
* jk/multi-line-indent-style-fix:
style: indent multiline "if" conditions to align
| -rw-r--r-- | remote.c | 2 | ||||
| -rw-r--r-- | upload-pack.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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); diff --git a/upload-pack.c b/upload-pack.c index a856de1ce0..25e0ee1e0d 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -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); } |