From: Olga Telezhnaya Date: Wed, 10 Jan 2018 09:36:41 GMT Subject: [PATCH v2 09/18] cat-file: simplify expand_atom function Message-ID: <01020160df6dc56f-955e97ff-4dc8-4471-8fb6-32dc9572781e-000000@eu-west-1.amazonses.com> In-Reply-To: <01020160df6dc499-0e6d11ec-1dcd-4a71-997b-ea231f33fae4-000000@eu-west-1.amazonses.com> Not sure, but looks like there is no need in that checking. There is a checking before whether it is null and we die in such case. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- builtin/cat-file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 9055fa3a8b0ae..dd43457c0ad7e 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -193,10 +193,9 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len, strbuf_addf(sb, "%lu", data->size); else if (is_atom("objectsize:disk", atom, len)) strbuf_addf(sb, "%"PRIuMAX, (uintmax_t)data->disk_size); - else if (is_atom("rest", atom, len)) { - if (data->rest) - strbuf_addstr(sb, data->rest); - } else if (is_atom("deltabase", atom, len)) + else if (is_atom("rest", atom, len)) + strbuf_addstr(sb, data->rest); + else if (is_atom("deltabase", atom, len)) strbuf_addstr(sb, oid_to_hex(&data->delta_base_oid)); else die("unknown format element: %.*s", len, atom); -- https://github.com/git/git/pull/450