git-gc --auto: simplify "repack" command line building

Since "-a" is removed from the base repack command line,
we can simplify how we add additional options to this
command line when using --auto.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/builtin-gc.c b/builtin-gc.c
index 6323e0d9db9f2e0119bd52bdc45bb5d8434d355d..956c32d1af66444dae26a705159beba9adb7aba7 100644 (file)
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -143,8 +143,6 @@ static int too_many_packs(void)
 
 static int need_to_gc(void)
 {
 
 static int need_to_gc(void)
 {

-       int ac = 0;
-

        /*
         * Setting gc.auto and gc.autopacklimit to 0 or negative can
         * disable the automatic gc.
        /*
         * Setting gc.auto and gc.autopacklimit to 0 or negative can
         * disable the automatic gc.


@@ -158,14 +156,10 @@ static int need_to_gc(void)
         * we run "repack -A -d -l".  Otherwise we tell the caller
         * there is no need.
         */
         * we run "repack -A -d -l".  Otherwise we tell the caller
         * there is no need.
         */

-       argv_repack[ac++] = "repack";

        if (too_many_packs())
        if (too_many_packs())

-               argv_repack[ac++] = "-A";
+               append_option(argv_repack, "-A", MAX_ADD);

        else if (!too_many_loose_objects())
                return 0;
        else if (!too_many_loose_objects())
                return 0;

-       argv_repack[ac++] = "-d";
-       argv_repack[ac++] = "-l";
-       argv_repack[ac++] = NULL;

        return 1;
 }
 
        return 1;
 }