t5620: make test work with path-walk var

The GIT_TEST_PACK_PATH_WALK test variable allows enabling the
--path-walk option to 'git pack-objects' by default. This sometimes
engages the warning that --path-walk is incompatible with the --filter
option. These tests in t5620 fail due to this warning over stderr in
this case. Disable this variable for this moment until these options
work together.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5620-backfill.sh b/t/t5620-backfill.sh
index 94f35ce19016716b2ca8c22faffaa8a05fb3e7a6..e1742907871ba3e5bba7f93d3de3db43b51e7a8b 100755 (executable)
--- a/t/t5620-backfill.sh
+++ b/t/t5620-backfill.sh
@@ -298,6 +298,9 @@ test_expect_success 'backfill with prefix pathspec' '
        git -C backfill-path rev-list --quiet --objects --missing=print HEAD >missing &&
        test_line_count = 48 missing &&
 
+       # If we enable --path-walk here, we will get a warning overs stderr
+       # due to incompatibilities with --filter.
+       GIT_TEST_PACK_PATH_WALK=0 \
        git -C backfill-path backfill HEAD -- d/f 2>err &&
        test_must_be_empty err &&
 
@@ -315,6 +318,9 @@ test_expect_success 'backfill with multiple pathspecs' '
        git -C backfill-path rev-list --quiet --objects --missing=print HEAD >missing &&
        test_line_count = 48 missing &&
 
+       # If we enable --path-walk here, we will get a warning overs stderr
+       # due to incompatibilities with --filter.
+       GIT_TEST_PACK_PATH_WALK=0 \
        git -C backfill-path backfill HEAD -- d/f a 2>err &&
        test_must_be_empty err &&
 
@@ -332,6 +338,9 @@ test_expect_success 'backfill with wildcard pathspec' '
        git -C backfill-path rev-list --quiet --objects --missing=print HEAD >missing &&
        test_line_count = 48 missing &&
 
+       # If we enable --path-walk here, we will get a warning overs stderr
+       # due to incompatibilities with --filter.
+       GIT_TEST_PACK_PATH_WALK=0 \
        git -C backfill-path backfill HEAD -- "d/file.*.txt" 2>err &&
        test_must_be_empty err &&