fixup! repack: add --path-walk option

Signed-off-by: Derrick Stolee <[email protected]>

Author: derrickstolee

Documentation/git-repack.adoc

@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]
 	[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]
-	[--write-midx] [--name-hash-version=<n>] [--path-walk]
+	[--write-midx] [--name-hash-version=<n>]
 
 DESCRIPTION
 -----------
@@ -258,18 +258,6 @@ linkgit:git-multi-pack-index[1]).
 	Provide this argument to the underlying `git pack-objects` process.
 	See linkgit:git-pack-objects[1] for full details.
 
---path-walk::
-	This option passes the `--path-walk` option to the underlying
-	`git pack-options` process (see linkgit:git-pack-objects[1]).
-	By default, `git pack-objects` walks objects in an order that
-	presents trees and blobs in an order unrelated to the path they
-	appear relative to a commit's root tree. The `--path-walk` option
-	enables a different walking algorithm that organizes trees and
-	blobs by path. This has the potential to improve delta compression
-	especially in the presence of filenames that cause collisions in
-	Git's default name-hash algorithm. Due to changing how the objects
-	are walked, this option is not compatible with `--delta-islands`
-	or `--filter`.
 
 CONFIGURATION
 -------------

builtin/repack.c

@@ -43,7 +43,7 @@ static char *packdir, *packtmp_name, *packtmp;
 static const char *const git_repack_usage[] = {
 	N_("git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
 	   "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-	   "[--write-midx] [--name-hash-version=<n>] [--path-walk]"),
+	   "[--write-midx] [--name-hash-version=<n>]"),
 	NULL
 };
 
@@ -63,7 +63,6 @@ struct pack_objects_args {
 	int quiet;
 	int local;
 	int name_hash_version;
-	int path_walk;
 	struct list_objects_filter_options filter_options;
 };
 
@@ -314,8 +313,6 @@ static void prepare_pack_objects(struct child_process *cmd,
 		strvec_pushf(&cmd->args, "--no-reuse-object");
 	if (args->name_hash_version)
 		strvec_pushf(&cmd->args, "--name-hash-version=%d", args->name_hash_version);
-	if (args->path_walk)
-		strvec_pushf(&cmd->args, "--path-walk");
 	if (args->local)
 		strvec_push(&cmd->args,  "--local");
 	if (args->quiet)
@@ -1187,8 +1184,6 @@ int cmd_repack(int argc,
 				N_("pass --no-reuse-object to git-pack-objects")),
 		OPT_INTEGER(0, "name-hash-version", &po_args.name_hash_version,
 				N_("specify the name hash version to use for grouping similar objects by path")),
-		OPT_BOOL(0, "path-walk", &po_args.path_walk,
-				N_("(EXPERIMENTAL!) pass --path-walk to git-pack-objects")),
 		OPT_NEGBIT('n', NULL, &run_update_server_info,
 				N_("do not run git-update-server-info"), 1),
 		OPT__QUIET(&po_args.quiet, N_("be quiet")),

t/perf/p5313-pack-objects.sh

@@ -64,28 +64,4 @@ do
 	'
 done
 
-test_perf 'thin pack with --path-walk' '
-	git pack-objects --thin --stdout --revs --sparse --path-walk <in-thin >out
-'
-
-test_size 'thin pack size with --path-walk' '
-	wc -c <out
-'
-
-test_perf 'big pack with --path-walk' '
-	git pack-objects --stdout --revs --sparse --path-walk <in-big >out
-'
-
-test_size 'big pack size with --path-walk' '
-	wc -c <out
-'
-
-test_perf 'repack with --path-walk' '
-	git repack -adf --path-walk
-'
-
-test_size 'repack size with --path-walk' '
-	wc -c <.git/objects/pack/pack-*.pack
-'
-
 test_done