From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Dec 2020 18:21:38 +0000 (-0800)
Subject: Merge branch 'jk/multi-line-indent-style-fix'
X-Git-Tag: v2.30.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c9f0df16a20071aa6810152dd7f4003f3d96c4b;p=thirdparty%2Fgit.git

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

Style fix.

* jk/multi-line-indent-style-fix:
  style: indent multiline "if" conditions to align
---

3c9f0df16a20071aa6810152dd7f4003f3d96c4b
diff --cc upload-pack.c
index a856de1ce0,ac67af8b3f..25e0ee1e0d
--- a/upload-pack.c
+++ b/upload-pack.c
@@@ -1324,14 -1074,11 +1324,14 @@@ static int upload_pack_config(const cha
  	}
  
  	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(&pack_objects_hook, var, value);
 +			return git_config_string(&data->pack_objects_hook, var, value);
  	}
  
 +	if (parse_object_filter_config(var, value, data) < 0)
 +		return -1;
 +
  	return parse_hide_refs_config(var, value, "uploadpack");
  }