From: Miklos Vajna <vmiklos@frugalware.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Bj?rn Steinbrink <B.Steinbrink@gmx.de>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: [PATCH 2/4] git-gc: add a --no-verify option to bypass the pre-auto-gc hook
Date: Mon, 31 Mar 2008 11:36:13 +0200 [thread overview]
Message-ID: <e755e3fd6b48cd43c61ae6c0c610aaa7b5e166f0.1206929014.git.vmiklos@frugalware.org> (raw)
In-Reply-To: <alpine.LFD.1.00.0803301645020.14670@woody.linux-foundation.org>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
Documentation/git-gc.txt | 4 ++++
builtin-gc.c | 4 +++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index d424a4e..396da5c 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -62,6 +62,10 @@ automatic consolidation of packs.
--quiet::
Suppress all progress reports.
+--no-verify::
+ This option bypasses the pre-auto-gc hook.
+ See also link:hooks.html[hooks].
+
Configuration
-------------
diff --git a/builtin-gc.c b/builtin-gc.c
index acd63be..1eca6b2 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -27,6 +27,7 @@ static int aggressive_window = -1;
static int gc_auto_threshold = 6700;
static int gc_auto_pack_limit = 50;
static char *prune_expire = "2.weeks.ago";
+static int no_verify;
#define MAX_ADD 10
static const char *argv_pack_refs[] = {"pack-refs", "--all", "--prune", NULL};
@@ -196,7 +197,7 @@ static int need_to_gc(void)
else if (!too_many_loose_objects())
return 0;
- if (run_hook())
+ if (!no_verify && run_hook())
return 0;
return 1;
}
@@ -214,6 +215,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
OPT_BOOLEAN(0, "aggressive", &aggressive, "be more thorough (increased runtime)"),
OPT_BOOLEAN(0, "auto", &auto_gc, "enable auto-gc mode"),
OPT_BOOLEAN('q', "quiet", &quiet, "suppress progress reports"),
+ OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-auto-gc hook"),
OPT_END()
};
--
1.5.5.rc2.4.g283c6
next prev parent reply other threads:[~2008-03-31 9:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-30 23:14 [PATCH] git gc --auto: defer on battery Miklos Vajna
2008-03-30 23:26 ` Björn Steinbrink
2008-03-30 23:39 ` Miklos Vajna
2008-03-30 23:55 ` Björn Steinbrink
2008-03-30 23:46 ` Linus Torvalds
2008-03-31 0:00 ` Björn Steinbrink
2008-03-31 2:06 ` Junio C Hamano
2008-03-31 15:02 ` Linus Torvalds
2008-03-31 16:43 ` Björn Steinbrink
2008-03-31 17:00 ` fetchmail (Re: [PATCH] git gc --auto: defer on battery) Linus Torvalds
2008-04-02 13:40 ` [PATCH] commit: resurrect "gc --auto" at the end Johannes Schindelin
2008-05-14 15:07 ` Johannes Schindelin
2008-05-14 18:13 ` Junio C Hamano
2008-05-14 18:40 ` Johannes Schindelin
2008-05-15 6:44 ` Holger Schurig
2008-03-31 9:35 ` [PATCH 0/4] add pre-auto-gc hook for git-gc --auto Miklos Vajna
2008-03-31 9:35 ` [PATCH 1/4] git-gc --auto: add pre-auto-gc hook Miklos Vajna
2008-03-31 9:36 ` Miklos Vajna [this message]
2008-03-31 9:36 ` [PATCH 3/4] Documentation/hooks: " Miklos Vajna
2008-03-31 9:37 ` [PATCH 4/4] templates: add an example " Miklos Vajna
2008-03-31 18:30 ` Brian Gernhardt
2008-03-31 18:08 ` [PATCH] git gc --auto: defer on battery Joey Hess
2008-03-30 23:41 ` Johannes Schindelin
2008-03-30 23:53 ` Miklos Vajna
2008-03-31 16:24 ` Brandon Casey
2008-03-31 17:38 ` Miklos Vajna
2008-03-31 18:31 ` Brandon Casey
[not found] <e755e3fd6b48cd43c61ae6c0c610aaa7b5e166f0.1206929014.git.vmiklos @frugalware.org>
2008-04-01 5:02 ` [PATCH 2/4] git-gc: add a --no-verify option to bypass the pre-auto-gc hook 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=e755e3fd6b48cd43c61ae6c0c610aaa7b5e166f0.1206929014.git.vmiklos@frugalware.org \
--to=vmiklos@frugalware.org \
--cc=B.Steinbrink@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=torvalds@linux-foundation.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).