summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-12-14 18:21:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-12-14 18:21:38 (GMT)
commit3c9f0df16a20071aa6810152dd7f4003f3d96c4b (patch)
treea6f870082686ba67f103da752cc8a8e932c7d8f7 /upload-pack.c
parenta5e74b4baaf17ea069fa451c405ef219eb61ee7a (diff)
parent08e9df2395b1116ffe932eaedbc3c89676902362 (diff)
downloadgit-3c9f0df16a20071aa6810152dd7f4003f3d96c4b.zip
git-3c9f0df16a20071aa6810152dd7f4003f3d96c4b.tar.gz
git-3c9f0df16a20071aa6810152dd7f4003f3d96c4b.tar.bz2
Merge branch 'jk/multi-line-indent-style-fix'
Style fix. * jk/multi-line-indent-style-fix: style: indent multiline "if" conditions to align
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c
index a856de1..25e0ee1 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);
}