Merge branch 'nd/upload-pack-shallow'

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index 1e2945ec7e397cf6b2e3b00bee0ca1df40a0e6a9..6902320e819651553beac7d80971b984b9168a8a 100755 (executable)
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -148,7 +148,7 @@ test_expect_success 'GIT_PREFIX for built-ins' '
        (
                cd dir &&
                printf "change" >two &&
-               env GIT_EXTERNAL_DIFF=./diff git diff >../actual
+               GIT_EXTERNAL_DIFF=./diff git diff >../actual
                git checkout -- two
        ) &&
        test_cmp expect actual