From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 7/8] git-gc --auto: restructure the way "repack" command line is built.
Date: Mon, 17 Sep 2007 01:44:53 -0700 [thread overview]
Message-ID: <1190018713416-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <11900186941912-git-send-email-gitster@pobox.com>
We used to build the command line to run repack outside of
need_to_gc() but with the next patch we would want to tweak the
command line depending on the nature of need.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin-gc.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/builtin-gc.c b/builtin-gc.c
index bf29f5e..34ce35b 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -29,8 +29,6 @@ static const char *argv_repack[MAX_ADD] = {"repack", "-a", "-d", "-l", NULL};
static const char *argv_prune[] = {"prune", NULL};
static const char *argv_rerere[] = {"rerere", "gc", NULL};
-static const char *argv_repack_auto[] = {"repack", "-d", "-l", NULL};
-
static int gc_config(const char *var, const char *value)
{
if (!strcmp(var, "gc.packrefs")) {
@@ -104,6 +102,8 @@ static int too_many_loose_objects(void)
static int need_to_gc(void)
{
+ int ac = 0;
+
/*
* Setting gc.auto to 0 or negative can disable the
* automatic gc
@@ -111,7 +111,14 @@ static int need_to_gc(void)
if (gc_auto_threshold <= 0)
return 0;
- return too_many_loose_objects();
+ if (!too_many_loose_objects())
+ return 0;
+
+ argv_repack[ac++] = "repack";
+ argv_repack[ac++] = "-d";
+ argv_repack[ac++] = "-l";
+ argv_repack[ac++] = NULL;
+ return 1;
}
int cmd_gc(int argc, const char **argv, const char *prefix)
@@ -154,8 +161,6 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
* Auto-gc should be least intrusive as possible.
*/
prune = 0;
- for (i = 0; i < ARRAY_SIZE(argv_repack_auto); i++)
- argv_repack[i] = argv_repack_auto[i];
if (!need_to_gc())
return 0;
}
--
1.5.3.1.967.g6bb01
next prev parent reply other threads:[~2007-09-17 8:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-17 8:44 [PATCH 1/8] Export matches_pack_name() and fix its return value Junio C Hamano
2007-09-17 8:44 ` [PATCH 2/8] pack-objects --keep-unreachable Junio C Hamano
2007-09-17 8:44 ` [PATCH 3/8] repack -A -d: use --keep-unreachable when repacking Junio C Hamano
2007-09-17 9:29 ` Johannes Schindelin
2007-09-17 10:00 ` Andreas Ericsson
2007-09-18 3:01 ` Shawn O. Pearce
2007-09-17 8:44 ` [PATCH 4/8] git-gc --auto: move threshold check to need_to_gc() function Junio C Hamano
2007-09-17 8:44 ` [PATCH 5/8] git-gc --auto: add documentation Junio C Hamano
2007-09-17 9:36 ` Johannes Schindelin
2007-09-17 19:54 ` Junio C Hamano
2007-09-17 8:44 ` [PATCH 6/8] git-gc --auto: protect ourselves from accumulated cruft Junio C Hamano
2007-09-17 8:44 ` Junio C Hamano [this message]
2007-09-17 9:41 ` [PATCH 7/8] git-gc --auto: restructure the way "repack" command line is built Johannes Schindelin
2007-09-17 19:53 ` Junio C Hamano
2007-09-17 8:44 ` [PATCH 8/8] git-gc --auto: run "repack -A -d -l" as necessary Junio C Hamano
2007-09-17 9:53 ` Johannes Schindelin
2007-09-17 19:54 ` Junio C Hamano
2007-09-18 2:59 ` Shawn O. Pearce
-- strict thread matches above, loose matches on Subject: below --
2007-09-17 8:27 [PATCH 0/8] Updated git-gc --auto series Junio C Hamano
2007-09-17 8:27 ` [PATCH 7/8] git-gc --auto: restructure the way "repack" command line is built Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1190018713416-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).