Junio C Hamano <gitster@pobox.com> wrote:
quoted text > Eric Wong <normalperson@yhbt.net> writes:
>
> > Here's a conservative change for 1.5.4 (not at all tested):
> >
> > From dbccd8081c6422569a9ca1211e27f56a24fdf3f3 Mon Sep 17 00:00:00 2001
> > From: Eric Wong <normalperson@yhbt.net>
> > Date: Mon, 21 Jan 2008 14:37:41 -0800
> > Subject: [PATCH] git-svn: default to repacking every 1000 commits
> >
> > This should reduce disk space usage when doing large imports.
> > We'll be switching to "gc --auto" post-1.5.4 to handle
> > repacking for us.
> >
> > Signed-off-by: Eric Wong <normalperson@yhbt.net>
> > ---
> > git-svn.perl | 8 +++-----
> > 1 files changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/git-svn.perl b/git-svn.perl
> > index 9f2b587..12745d5 100755
> > --- a/git-svn.perl
> > +++ b/git-svn.perl
> > @@ -1408,11 +1408,9 @@ sub read_all_remotes {
> > }
> >
> > sub init_vars {
> > - if (defined $_repack) {
> > - $_repack = 1000 if ($_repack <= 0);
> > - $_repack_nr = $_repack;
> > - $_repack_flags ||= '-d';
> > - }
> > + $_repack = 1000 unless (defined $_repack && $_repack > 0);
> > + $_repack_nr = $_repack;
> > + $_repack_flags ||= '-d';
> > }
> >
> > sub verify_remotes_sanity {
>
> Thanks, but I think you need to do something about this part:
>
> 2154: if (defined $_repack && (--$_repack_nr == 0)) {
>
> I'd say
>
> if ($_repack && (--$_repack_nr == 0)) {
init_vars() is called unconditionally, and always defines $_repack.
It could actually just be:
if (--$_repack_nr == 0) {
--
Eric Wong
-
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