bisect: refactor bisect_run() to match CodingGuidelines

We didn't add "{}" to all "if/else" branches, and one "error" was
mis-indented. Let's fix that first, which makes subsequent commits
smaller. In the case of the "if" we can simply early return instead.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 6e41cbdb2d3785cadb5ab901586585daee8718e0..08d83e68675428813421f2b0c79179cd406e5d00 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -1191,13 +1191,12 @@ static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
        if (bisect_next_check(terms, NULL))
                return BISECT_FAILED;
 
-       if (argc)
-               sq_quote_argv(&command, argv);
-       else {
+       if (!argc) {
                error(_("bisect run failed: no command provided."));
                return BISECT_FAILED;
        }
 
+       sq_quote_argv(&command, argv);
        while (1) {
                res = do_bisect_run(command.buf);
 
@@ -1268,7 +1267,7 @@ static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
                        res = BISECT_OK;
                } else if (res) {
                        error(_("bisect run failed: 'git bisect--helper --bisect-state"
-                       " %s' exited with error code %d"), new_state, res);
+                               " %s' exited with error code %d"), new_state, res);
                } else {
                        continue;
                }