send-email: add --[no-]xmailer option

diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index df5baf8d6f962a53b398099433fe750bb5019df5..5b2b1c2c130387332778f6e49043b739dd2d7d21 100755 (executable)
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -561,20 +561,18 @@ do
                do
                        case "$p" in
                        *ssh*)
-                               hh=$(echo $h | tr -d "[]")
                                pp=ssh
                                ;;
                        *)
-                               hh=$h
                                pp=$p
                        ;;
                        esac
                        test_expect_success "fetch-pack --diag-url $p://$h/$r" '
-                               check_prot_host_path $p://$h/$r $pp "$hh" "/$r"
+                               check_prot_host_path $p://$h/$r $pp "$h" "/$r"
                        '
                        # "/~" -> "~" conversion
                        test_expect_success "fetch-pack --diag-url $p://$h/~$r" '
-                               check_prot_host_path $p://$h/~$r $pp "$hh" "~$r"
+                               check_prot_host_path $p://$h/~$r $pp "$h" "~$r"
                        '
                done
        done
@@ -604,15 +602,21 @@ do
        p=ssh
        for h in host [::1]
        do
-               hh=$(echo $h | tr -d "[]")
                test_expect_success "fetch-pack --diag-url $h:$r" '
                        check_prot_path $h:$r $p "$r"
                '
                # Do "/~" -> "~" conversion
                test_expect_success "fetch-pack --diag-url $h:/~$r" '
-                       check_prot_host_path $h:/~$r $p "$hh" "~$r"
+                       check_prot_host_path $h:/~$r $p "$h" "~$r"
                '
        done
 done
 
+test_expect_success MINGW 'fetch-pack --diag-url file://c:/repo' '
+       check_prot_path file://c:/repo file c:/repo
+'
+test_expect_success MINGW 'fetch-pack --diag-url c:repo' '
+       check_prot_path c:repo file c:repo
+'
+
 test_done