Change the formatting in loose_object_info() to conform with our usual
coding style:
When there are multiple arms to a conditional and some of them
require braces, enclose even a single line block in braces for
consistency -- Documentation/CodingGuidelines
This formatting-only change makes a subsequent commit easier to read.
Signed-off-by: Ævar Arnfjörð Bjarmason <redacted>
---
object-file.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/object-file.c b/object-file.c
index e0ba1842272..646ca7f85d6 100644
--- a/object-file.c
+++ b/object-file.c
@@ -1450,17 +1450,20 @@ static int loose_object_info(struct repository *r,
if (unpack_loose_header_to_strbuf(&stream, map, mapsize, hdr, sizeof(hdr), &hdrbuf) < 0)
status = error(_("unable to unpack %s header with --allow-unknown-type"),
oid_to_hex(oid));
- } else if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0)
+ } else if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0) {
status = error(_("unable to unpack %s header"),
oid_to_hex(oid));
- if (status < 0)
- ; /* Do nothing */
- else if (hdrbuf.len) {
+ }
+
+ if (status < 0) {
+ /* Do nothing */
+ } else if (hdrbuf.len) {
if ((status = parse_loose_header(hdrbuf.buf, oi, flags)) < 0)
status = error(_("unable to parse %s header with --allow-unknown-type"),
oid_to_hex(oid));
- } else if ((status = parse_loose_header(hdr, oi, flags)) < 0)
+ } else if ((status = parse_loose_header(hdr, oi, flags)) < 0) {
status = error(_("unable to parse %s header"), oid_to_hex(oid));
+ }
if (status >= 0 && oi->contentp) {
*oi->contentp = unpack_loose_rest(&stream, hdr,@@ -1469,8 +1472,9 @@ static int loose_object_info(struct repository *r,
git_inflate_end(&stream);
status = -1;
}
- } else
+ } else {
git_inflate_end(&stream);
+ }
munmap(map, mapsize);
if (oi->sizep == &size_scratch)--
2.32.0.606.g2e440ee2c94