From: Nathaniel Filardo <nwf20@cl.cam.ac.uk>
To: git@vger.kernel.org
Cc: Derrick Stolee <dstolee@microsoft.com>,
Nathaniel Filardo <nwf20@cl.cam.ac.uk>
Subject: [PATCH 3/4] repack: add --sparse and pass to pack-objects
Date: Tue, 12 Mar 2019 13:18:57 +0000 [thread overview]
Message-ID: <20190312131858.26115-4-nwf20@cl.cam.ac.uk> (raw)
In-Reply-To: <20190312131858.26115-1-nwf20@cl.cam.ac.uk>
The sparse connectivity algorithm saves a whole lot of time when there
are UNINTERESTING trees around.
---
Documentation/git-repack.txt | 4 ++++
builtin/repack.c | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index aa0cc8bd44..836d81457a 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -165,6 +165,10 @@ depth is 4095.
Pass the `--delta-islands` option to `git-pack-objects`, see
linkgit:git-pack-objects[1].
+--sparse::
+ Pass the `--sparse` option to `git-pack-objects`; see
+ linkgit:git-pack-objects[1].
+
Configuration
-------------
diff --git a/builtin/repack.c b/builtin/repack.c
index 67f8978043..71e715b594 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -17,6 +17,7 @@ static int pack_kept_objects = -1;
static int write_bitmaps;
static int use_delta_islands;
static char *packdir, *packtmp;
+static int sparse;
static const char *const git_repack_usage[] = {
N_("git repack [<options>]"),
@@ -48,6 +49,10 @@ static int repack_config(const char *var, const char *value, void *cb)
use_delta_islands = git_config_bool(var, value);
return 0;
}
+ if (!strcmp(var, "pack.usesparse")) {
+ sparse = git_config_bool(var, value);
+ return 0;
+ }
return git_default_config(var, value, cb);
}
@@ -326,11 +331,14 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
N_("maximum size of each packfile")),
OPT_BOOL(0, "pack-kept-objects", &pack_kept_objects,
N_("repack objects in packs marked with .keep")),
+ OPT_BOOL(0, "sparse", &sparse,
+ N_("use the sparse reachability algorithm")),
OPT_STRING_LIST(0, "keep-pack", &keep_pack_list, N_("name"),
N_("do not repack this pack")),
OPT_END()
};
+ sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0);
git_config(repack_config, NULL);
argc = parse_options(argc, argv, prefix, builtin_repack_options,
@@ -366,6 +374,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
argv_array_push(&cmd.args, "--all");
argv_array_push(&cmd.args, "--reflog");
argv_array_push(&cmd.args, "--indexed-objects");
+ if (sparse)
+ argv_array_push(&cmd.args, "--sparse");
if (repository_format_partial_clone)
argv_array_push(&cmd.args, "--exclude-promisor-objects");
if (write_bitmaps)
--
2.17.1
next prev parent reply other threads:[~2019-03-12 13:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-12 13:18 [PATCH 0/4] Speed up repacking when lots of pack-kept objects Nathaniel Filardo
2019-03-12 13:18 ` [PATCH 1/4] count-objects: report statistics about kept packs Nathaniel Filardo
2019-03-12 13:18 ` [PATCH 2/4] revision walk: optionally use sparse reachability Nathaniel Filardo
2019-03-12 13:59 ` Derrick Stolee
2019-03-12 13:18 ` Nathaniel Filardo [this message]
2019-03-12 13:47 ` [PATCH 3/4] repack: add --sparse and pass to pack-objects Derrick Stolee
2019-03-12 14:03 ` Dr N.W. Filardo
2019-03-12 13:18 ` [PATCH 4/4] repack: optionally assume transitive kept packs Nathaniel Filardo
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=20190312131858.26115-4-nwf20@cl.cam.ac.uk \
--to=nwf20@cl.cam.ac.uk \
--cc=dstolee@microsoft.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).