[PATCH 12/32] pack-objects: support --narrow-tree
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/pack-objects.c | 9 +++++++++
t/t6061-rev-list-narrow.sh | 27 +++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a664223..36ab350 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -106,6 +106,7 @@ static int object_ix_hashsz;
static uint32_t written, written_delta;
static uint32_t reused, reused_delta;
+const char *narrow_prefix;
static void *get_delta(struct object_entry *entry)
{
@@ -2055,6 +2056,10 @@ static void get_object_list(int ac, const char **av)
init_revisions(&revs, NULL);
save_commit_buffer = 0;
setup_revisions(ac, av, &revs, NULL);
+ if (narrow_prefix) {
+ revs.narrow_tree = 1;
+ revs.narrow_prefix = narrow_prefix;
+ }
while (fgets(line, sizeof(line), stdin) != NULL) {
int len = strlen(line);
@@ -2259,6 +2264,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
grafts_replace_parents = 0;
continue;
}
+ if (!prefixcmp(arg, "--narrow-tree=")) {
+ narrow_prefix = arg + 14;
+ continue;
+ }
usage(pack_usage);
}
diff --git a/t/t6061-rev-list-narrow.sh b/t/t6061-rev-list-narrow.sh
index e489347..30ef46f 100755
--- a/t/t6061-rev-list-narrow.sh
+++ b/t/t6061-rev-list-narrow.sh
@@ -155,4 +155,31 @@ test_expect_success 'rev-list --narrow-tree=t1/t12 with merges' '
test_cmp merge.expected result
'
+cat <<EOF >pack.expected
+04156ae83e615fa5b6019170928bc131539f9996
+0da28f8308e336bd4b2c26b61c7fc44e41a30e49
+3b52e9990a52d9ea46b25199b5810566324759f4
+4fc1656b01ce8b21987c55a2870b8c9a431ec772
+52bd8e43afb01d0c9747f1fedf2fc94684ee4cc4
+72e05e456b9ff4c01ccf6178ce60d9b52b41aae4
+7475cb8a389b36ce238b9ee6cbfdfa26a1b67e35
+74a398027f0b59183db54ca8c67dc30b5aeed0ff
+aa0602ee56ea4cb5e5bfff8713bb8a9a6ab4303e
+ab246f7eb05e94f695d2a0e30093d94fde7b837e
+af9c31c0e217154296d93d66b9a5a41892c7b321
+ba7a30916c792624a8372cb26da50f5594098222
+d77d258d806b2aa7cdb5a301e6a54f023d9bdcfe
+d81015b2a1c40fc6cbc5bf5a8b16949018c3aede
+fa0bba1767985729582729a12a5459cd041d6cf6
+EOF
+
+test_expect_success 'pack-object --narrow-tree=t1/t12' '
+ echo $MERGE|git pack-objects --revs --narrow-tree=t1/t12 --stdout >p.pack &&
+ git index-pack -o p.idx p.pack &&
+ git verify-pack -v p.pack |
+ grep "^[0-9a-f][0-9a-f][0-9a-f][0-9a-f]" |
+ cut -d " " -f 1 >result &&
+ test_cmp pack.expected result
+'
+
test_done
--
1.7.1.rc1.69.g24c2f7
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>