[PATCH 10/20] cat-file: simplify expand_atom function
- From
Olga Telezhnaya <olyatelezhnaya@gmail.com>
- Date
- Jan 9, 2018, 13:05 UTC
- Message-ID
- <01020160db067b07-5333ec0b-ce92-4f85-bceb-bbb9761793a9-000000@eu-west-1.amazonses.com>
- In-Reply-To
- <01020160db0679c9-799a0bc4-b6d1-43e2-ad3b-80be4e4c55e9-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 <olyatelezhnaya@gmail.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored by: Jeff King <peff@peff.net> --- 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