From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 4 Feb 2022 23:48:23 +0000 (+0100)
Subject: object-file.c: split up declaration of unrelated variables
X-Git-Tag: v2.36.0-rc0~66^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbea0ddeb9bd9eefe568a9f4456cccf630704d8c;p=thirdparty%2Fgit.git

object-file.c: split up declaration of unrelated variables

Split up the declaration of the "ret" and "re_allocated"
variables. It's not our usual style to group variable declarations
simply because they share a type, we'd only prefer to do so when the
two are closely related (e.g. "int i, j"). This change makes a
subsequent and meaningful change's diff smaller.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/object-file.c b/object-file.c
index 8be57f48de..ecc7797329 100644
--- a/object-file.c
+++ b/object-file.c
@@ -2118,7 +2118,8 @@ static int index_mem(struct index_state *istate,
 		     enum object_type type,
 		     const char *path, unsigned flags)
 {
-	int ret, re_allocated = 0;
+	int ret;
+	int re_allocated = 0;
 	int write_object = flags & HASH_WRITE_OBJECT;
 
 	if (!type)