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: [PATCHv2 3/5] repack: add --sparse and pass to pack-objects
Date: Sat, 16 Mar 2019 20:05:18 +0000 [thread overview]
Message-ID: <20190316200520.14260-4-nwf20@cl.cam.ac.uk> (raw)
In-Reply-To: <20190316200520.14260-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 | 5 +++++
t/t5322-pack-objects-sparse.sh | 6 ++++++
3 files changed, 15 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..8e7641482b 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -288,6 +288,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
int no_update_server_info = 0;
int midx_cleared = 0;
struct pack_objects_args po_args = {NULL};
+ int sparse = 0;
struct option builtin_repack_options[] = {
OPT_BIT('a', NULL, &pack_everything,
@@ -326,6 +327,8 @@ 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()
@@ -366,6 +369,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)
diff --git a/t/t5322-pack-objects-sparse.sh b/t/t5322-pack-objects-sparse.sh
index 7124b5581a..66e133dcfe 100755
--- a/t/t5322-pack-objects-sparse.sh
+++ b/t/t5322-pack-objects-sparse.sh
@@ -133,4 +133,10 @@ test_expect_success 'pack.useSparse overridden' '
test_cmp required_objects.txt sparse_objects.txt
'
+# repack --sparse invokes pack-objects --sparse
+test_expect_success 'repack --sparse and fsck' '
+ git repack -a --sparse &&
+ git fsck
+'
+
test_done
--
2.17.1
next prev parent reply other threads:[~2019-03-16 20:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-16 20:05 [PATCHv2 0/5] Speed up repacking when lots of pack-kept objects Nathaniel Filardo
2019-03-16 20:05 ` [PATCHv2 1/5] count-objects: report statistics about kept packs Nathaniel Filardo
2019-03-16 20:05 ` [PATCHv2 2/5] revision walk: optionally use sparse reachability Nathaniel Filardo
2019-03-16 20:05 ` Nathaniel Filardo [this message]
2019-03-16 20:05 ` [PATCHv2 4/5] repack: optionally assume transitive kept packs Nathaniel Filardo
2019-03-16 20:05 ` [PATCHv2 5/5] builtin/gc: add --assume-pack-keep-transitive 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=20190316200520.14260-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).