cat-file: merge two block into one

There are two "if (opt->all_objects)" blocks next
to each other, merge them into one to provide better
readability.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 02461bb5ea6f977193d3a361258fda1d1d1fd197..243fe6844bc67a2140900decc066247dac6935a0 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -520,14 +520,11 @@ static int batch_objects(struct batch_options *opt)
                data.info.typep = &data.type;
 
        if (opt->all_objects) {
+               struct object_cb_data cb;
                struct object_info empty = OBJECT_INFO_INIT;
 
                if (!memcmp(&data.info, &empty, sizeof(empty)))
                        data.skip_object_info = 1;
-       }
-
-       if (opt->all_objects) {
-               struct object_cb_data cb;
 
                if (has_promisor_remote())
                        warning("This repository uses promisor remotes. Some objects may not be loaded.");