fixup! pack-objects: introduce GIT_TEST_PACK_PATH_WALK

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

Author: derrickstolee

builtin/pack-objects.c

@@ -221,7 +221,7 @@ static int delta_search_threads;
 static int pack_to_stdout;
 static int sparse;
 static int thin;
-static int path_walk = -1;
+static int path_walk;
 static int num_preferred_base;
 static struct progress *progress_state;
 
@@ -4310,7 +4310,7 @@ static int add_objects_by_path(const char *path,
 		struct object_id *oid = &oids->oid[i];
 
 		/* Skip objects that do not exist locally. */
-		if ((exclude_promisor_objects || arg_missing_action != MA_ERROR) &&
+		if (exclude_promisor_objects &&
 		    oid_object_info_extended(the_repository, oid, &oi,
 					     OBJECT_INFO_FOR_PREFETCH) < 0)
 			continue;
@@ -4728,14 +4728,6 @@ int cmd_pack_objects(int argc,
 	if (pack_to_stdout != !base_name || argc)
 		usage_with_options(pack_usage, pack_objects_options);
 
-	if (path_walk < 0) {
-		if (use_bitmap_index > 0 ||
-		    !use_internal_rev_list)
-			path_walk = 0;
-		else
-			path_walk = git_env_bool("GIT_TEST_PACK_PATH_WALK", 0);
-	}
-
 	if (depth < 0)
 		depth = 0;
 	if (depth >= (1 << OE_DEPTH_BITS)) {

ci/run-build-and-tests.sh

@@ -26,7 +26,6 @@ linux-TEST-vars)
 	export GIT_TEST_NO_WRITE_REV_INDEX=1
 	export GIT_TEST_CHECKOUT_WORKERS=2
 	export GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1
-	export GIT_TEST_PACK_PATH_WALK=1
 	;;
 linux-clang)
 	export GIT_TEST_DEFAULT_HASH=sha1

t/README

@@ -415,10 +415,6 @@ GIT_TEST_PACK_SPARSE=<boolean> if disabled will default the pack-objects
 builtin to use the non-sparse object walk. This can still be overridden by
 the --sparse command-line argument.
 
-GIT_TEST_PACK_PATH_WALK=<boolean> if enabled will default the pack-objects
-builtin to use the path-walk API for the object walk. This can still be
-overridden by the --no-path-walk command-line argument.
-
 GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
 by overriding the minimum number of cache entries required per thread.
 

t/t0411-clone-from-partial.sh

@@ -59,12 +59,6 @@ test_expect_success 'pack-objects should fetch from promisor remote and execute
 
 test_expect_success 'clone from promisor remote does not lazy-fetch by default' '
 	rm -f script-executed &&
-
-	# The --path-walk feature of "git pack-objects" is not
-	# compatible with this kind of fetch from an incomplete repo.
-	GIT_TEST_PACK_PATH_WALK=0 &&
-	export GIT_TEST_PACK_PATH_WALK &&
-
 	test_must_fail git clone evil no-lazy 2>err &&
 	test_grep "lazy fetching disabled" err &&
 	test_path_is_missing script-executed

t/t5306-pack-nobase.sh

@@ -59,11 +59,6 @@ test_expect_success 'indirectly clone patch_clone' '
 	 git pull ../.git &&
 	 test $(git rev-parse HEAD) = $B &&
 
-	# The --path-walk feature of "git pack-objects" is not
-	# compatible with this kind of fetch from an incomplete repo.
-	GIT_TEST_PACK_PATH_WALK=0 &&
-	export GIT_TEST_PACK_PATH_WALK &&
-
 	 git pull ../patch_clone/.git &&
 	 test $(git rev-parse HEAD) = $C
 	)

t/t5310-pack-bitmaps.sh

@@ -158,9 +158,8 @@ test_bitmap_cases () {
 		ls .git/objects/pack/ | grep bitmap >output &&
 		test_line_count = 1 output &&
 		# verify equivalent packs are generated with/without using bitmap index
-		# Be careful to not use the path-walk option in either case.
-		packasha1=$(git pack-objects --no-use-bitmap-index --no-path-walk --all packa </dev/null) &&
-		packbsha1=$(git pack-objects --use-bitmap-index --no-path-walk --all packb </dev/null) &&
+		packasha1=$(git pack-objects --no-use-bitmap-index --all packa </dev/null) &&
+		packbsha1=$(git pack-objects --use-bitmap-index --all packb </dev/null) &&
 		list_packed_objects packa-$packasha1.idx >packa.objects &&
 		list_packed_objects packb-$packbsha1.idx >packb.objects &&
 		test_cmp packa.objects packb.objects
@@ -389,14 +388,6 @@ test_bitmap_cases () {
 		git init --bare client.git &&
 		(
 			cd client.git &&
-
-			# This test relies on reusing a delta, but if the
-			# path-walk machinery is engaged, the base object
-			# is considered too small to use during the
-			# dynamic computation, so is not used.
-			GIT_TEST_PACK_PATH_WALK=0 &&
-			export GIT_TEST_PACK_PATH_WALK &&
-
 			git config transfer.unpackLimit 1 &&
 			git fetch .. delta-reuse-old:delta-reuse-old &&
 			git fetch .. delta-reuse-new:delta-reuse-new &&

t/t5316-pack-delta-depth.sh

@@ -89,18 +89,15 @@ max_chain() {
 # adjusted (or scrapped if the heuristics have become too unreliable)
 test_expect_success 'packing produces a long delta' '
 	# Use --window=0 to make sure we are seeing reused deltas,
-	# not computing a new long chain. (Also avoid the --path-walk
-	# option as it may break delta chains.)
-	pack=$(git pack-objects --all --window=0 --no-path-walk </dev/null pack) &&
+	# not computing a new long chain.
+	pack=$(git pack-objects --all --window=0 </dev/null pack) &&
 	echo 9 >expect &&
 	max_chain pack-$pack.pack >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success '--depth limits depth' '
-	# Avoid --path-walk to avoid breaking delta chains across path
-	# boundaries.
-	pack=$(git pack-objects --all --depth=5 --no-path-walk </dev/null pack) &&
+	pack=$(git pack-objects --all --depth=5 </dev/null pack) &&
 	echo 5 >expect &&
 	max_chain pack-$pack.pack >actual &&
 	test_cmp expect actual

t/t5332-multi-pack-reuse.sh

@@ -7,13 +7,6 @@ test_description='pack-objects multi-pack reuse'
 
 GIT_TEST_MULTI_PACK_INDEX=0
 GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=0
-
-# The --path-walk option does not consider the preferred pack
-# at all for reusing deltas, so this variable changes the
-# behavior of this test, if enabled.
-GIT_TEST_PACK_PATH_WALK=0
-export GIT_TEST_PACK_PATH_WALK
-
 objdir=.git/objects
 packdir=$objdir/pack
 

t/t5530-upload-pack-error.sh

@@ -34,12 +34,6 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' '
 	hexsz=$(test_oid hexsz) &&
 	printf "%04xwant %s\n00000009done\n0000" \
 		$(($hexsz + 10)) $head >input &&
-
-	# The current implementation of path-walk causes a different
-	# error message. This will be changed by a future refactoring.
-	GIT_TEST_PACK_PATH_WALK=0 &&
-	export GIT_TEST_PACK_PATH_WALK &&
-
 	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
 	test_grep "unable to read" output.err &&
 	test_grep "pack-objects died" output.err

t/t7406-submodule-update.sh

@@ -1103,16 +1103,13 @@ test_expect_success 'submodule update --quiet passes quietness to fetch with a s
 	git clone super4 super5 &&
 	(cd super5 &&
 	 # This test var can mess with the stderr output checked in this test.
-	 GIT_TEST_PACK_PATH_WALK=0 \
 	 GIT_TEST_NAME_HASH_VERSION=1 \
 		git submodule update --quiet --init --depth=1 submodule3 >out 2>err &&
 	 test_must_be_empty out &&
 	 test_must_be_empty err
 	) &&
 	git clone super4 super6 &&
 	(cd super6 &&
-	 # This test variable will create a "warning" message to stderr
-	 GIT_TEST_PACK_PATH_WALK=0 \
 	 git submodule update --init --depth=1 submodule3 >out 2>err &&
 	 test_file_not_empty out &&
 	 test_file_not_empty err