[PATCH 2/4] git-gc: add a --no-verify option to bypass the pre-auto-gc hook

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Linus Torvalds <torvalds@...>
Cc: Bj?rn Steinbrink <B.Steinbrink@...>, Junio C Hamano <gitster@...>, <git@...>
Date: Monday, March 31, 2008 - 5:36 am

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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] git gc --auto: defer on battery, Miklos Vajna, (Sun Mar 30, 7:14 pm)
Re: [PATCH] git gc --auto: defer on battery, Brandon Casey, (Mon Mar 31, 12:24 pm)
Re: [PATCH] git gc --auto: defer on battery, Miklos Vajna, (Mon Mar 31, 1:38 pm)
Re: [PATCH] git gc --auto: defer on battery, Brandon Casey, (Mon Mar 31, 2:31 pm)
Re: [PATCH] git gc --auto: defer on battery, Johannes Schindelin, (Sun Mar 30, 7:41 pm)
Re: [PATCH] git gc --auto: defer on battery, Miklos Vajna, (Sun Mar 30, 7:53 pm)
Re: [PATCH] git gc --auto: defer on battery, Björn, (Sun Mar 30, 7:26 pm)
Re: [PATCH] git gc --auto: defer on battery, Linus Torvalds, (Sun Mar 30, 7:46 pm)
Re: [PATCH] git gc --auto: defer on battery, Joey Hess, (Mon Mar 31, 2:08 pm)
[PATCH 4/4] templates: add an example pre-auto-gc hook, Miklos Vajna, (Mon Mar 31, 5:37 am)
Re: [PATCH 4/4] templates: add an example pre-auto-gc hook, Brian Gernhardt, (Mon Mar 31, 2:30 pm)
[PATCH 3/4] Documentation/hooks: add pre-auto-gc hook, Miklos Vajna, (Mon Mar 31, 5:36 am)
[PATCH 2/4] git-gc: add a --no-verify option to bypass the p..., Miklos Vajna, (Mon Mar 31, 5:36 am)
[PATCH 1/4] git-gc --auto: add pre-auto-gc hook, Miklos Vajna, (Mon Mar 31, 5:35 am)
[PATCH 0/4] add pre-auto-gc hook for git-gc --auto, Miklos Vajna, (Mon Mar 31, 5:35 am)
Re: [PATCH] git gc --auto: defer on battery, Junio C Hamano, (Sun Mar 30, 10:06 pm)
[PATCH] commit: resurrect "gc --auto" at the end, Johannes Schindelin, (Wed Apr 2, 9:40 am)
Re: [PATCH] commit: resurrect "gc --auto" at the end, Johannes Schindelin, (Wed May 14, 11:07 am)
Re: [PATCH] commit: resurrect "gc --auto" at the end, Junio C Hamano, (Wed May 14, 2:13 pm)
Re: [PATCH] commit: resurrect "gc --auto" at the end, Holger Schurig, (Thu May 15, 2:44 am)
Re: [PATCH] commit: resurrect "gc --auto" at the end, Johannes Schindelin, (Wed May 14, 2:40 pm)
Re: [PATCH] git gc --auto: defer on battery, Linus Torvalds, (Mon Mar 31, 11:02 am)
Re: [PATCH] git gc --auto: defer on battery, Björn, (Mon Mar 31, 12:43 pm)
fetchmail (Re: [PATCH] git gc --auto: defer on battery), Linus Torvalds, (Mon Mar 31, 1:00 pm)
Re: [PATCH] git gc --auto: defer on battery, Björn, (Sun Mar 30, 8:00 pm)
[PATCH] git gc --auto: defer on battery, Miklos Vajna, (Sun Mar 30, 7:39 pm)
Re: [PATCH] git gc --auto: defer on battery, Björn, (Sun Mar 30, 7:55 pm)