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

avar · gitster · commit bbea0ddeb9bd · 2022-02-25T17:16:31.000-08:00
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 &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -2118,7 +2118,8 @@ static int index_mem(struct index_state *istate,`
`2118`	`2118`	`enum object_type type,`
`2119`	`2119`	`const char *path, unsigned flags)`
`2120`	`2120`	`{`
`2121`		`- int ret, re_allocated = 0;`
	`2121`	`+ int ret;`
	`2122`	`+ int re_allocated = 0;`
`2122`	`2123`	`int write_object = flags & HASH_WRITE_OBJECT;`
`2123`	`2124`
`2124`	`2125`	`if (!type)`