Merge branch 'bc/reread-attributes-during-rebase'

diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index 55c78709978ff75cdbd794ee4c816dfd1eb55ef0..106eddbd85b04ac8539b722ade63936e28325840 100755 (executable)
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -158,11 +158,16 @@ test_expect_success 'git archive --format=zip with --output' \
     'git archive --format=zip --output=d2.zip HEAD &&
     test_cmp_bin d.zip d2.zip'
 
-test_expect_success 'git archive with --output, inferring format' '
+test_expect_success 'git archive with --output, inferring format (local)' '
        git archive --output=d3.zip HEAD &&
        test_cmp_bin d.zip d3.zip
 '
 
+test_expect_success 'git archive with --output, inferring format (remote)' '
+       git archive --remote=. --output=d4.zip HEAD &&
+       test_cmp_bin d.zip d4.zip
+'
+
 test_expect_success \
     'git archive --format=zip with prefix' \
     'git archive --format=zip --prefix=prefix/ HEAD >e.zip'