]> git.ipfire.org Git - thirdparty/git.git/commitdiff
gc: return from cmd_gc(), don't call exit()
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 7 Dec 2021 18:26:32 +0000 (19:26 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Dec 2021 21:25:16 +0000 (13:25 -0800)
A minor code cleanup. Let's "return" from cmd_gc() instead of calling
exit(). See 338abb0f045 (builtins + test helpers: use return instead
of exit() in cmd_*, 2021-06-08) for other such cases.

While we're at it add a \n to separate the variable declaration from
the rest of the code in this block. Both of these changes make a
subsequent change smaller and easier to read.

This change isn't really needed for that subsequent change, but now
someone viewing that future behavior change won't need to wonder why
we're either still calling exit() here, or fixing it while we're at
it.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/gc.c

index bcef6a4c8da71f54d923bbccc7a152a068e3b8c4..900ccfb8d48d03931ccd1c656f6ff936817188b4 100644 (file)
@@ -611,9 +611,10 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
                }
                if (detach_auto) {
                        int ret = report_last_gc_error();
+
                        if (ret < 0)
                                /* an I/O error occurred, already reported */
-                               exit(128);
+                               return 128;
                        if (ret == 1)
                                /* Last gc --auto failed. Skip this one. */
                                return 0;