fetch-pack: avoid repeatedly re-scanning pack directory

diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index befd82342211407bba668d59dd87dd48c5f9467b..b7ad716b09facbc068a23c48cdbfe68a87f52d4c 100755 (executable)
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -134,9 +134,13 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
        exit 1
        EOF
        chmod 755 badp4dir/p4 &&
-       PATH="$TRASH_DIRECTORY/badp4dir:$PATH" git p4 clone --dest="$git" //depot >errs 2>&1 ; retval=$? &&
-       test $retval -eq 1 &&
-       test_must_fail grep -q Traceback errs
+       (
+               PATH="$TRASH_DIRECTORY/badp4dir:$PATH" &&
+               export PATH &&
+               test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
+       ) &&
+       cat errs &&
+       ! test_i18ngrep Traceback errs
 '
 
 test_expect_success 'clone bare' '
@@ -151,11 +155,6 @@ test_expect_success 'clone bare' '
        )
 '
 
-marshal_dump() {
-       what=$1
-       "$PYTHON_PATH" -c 'import marshal, sys; d = marshal.load(sys.stdin); print d["'$what'"]'
-}
-
 # Sleep a bit so that the top-most p4 change did not happen "now".  Then
 # import the repo and make sure that the initial import has the same time
 # as the top-most change.