diff --git a/Documentation/git-svn.adoc b/Documentation/git-svn.adoc index c26c12bab3..047c412018 100644 --- a/Documentation/git-svn.adoc +++ b/Documentation/git-svn.adoc @@ -9,6 +9,7 @@ SYNOPSIS -------- [verse] 'git svn' [] [] +(UNSUPPORTED!) DESCRIPTION ----------- diff --git a/compat/mingw.c b/compat/mingw.c index be5ea9a645..eb7acbefbf 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1509,6 +1509,9 @@ revert_attrs: size_t mingw_strftime(char *s, size_t max, const char *format, const struct tm *tm) { +#ifdef _UCRT + size_t ret = strftime(s, max, format, tm); +#else /* a pointer to the original strftime in case we can't find the UCRT version */ static size_t (*fallback)(char *, size_t, const char *, const struct tm *) = strftime; size_t ret; @@ -1519,6 +1522,7 @@ size_t mingw_strftime(char *s, size_t max, ret = strftime(s, max, format, tm); else ret = fallback(s, max, format, tm); +#endif if (!ret && errno == EINVAL) die("invalid strftime format: '%s'", format); diff --git a/git-svn.perl b/git-svn.perl index 32c648c395..37af8e873a 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -305,6 +305,19 @@ sub term_init { : new Term::ReadLine 'git-svn'; } +sub deprecated_warning { + my @lines = @_; + if (-t STDERR) { + @lines = map { "\e[33m$_\e[0m" } @lines; + } + warn join("\n", @lines), "\n"; +} + +deprecated_warning( + "WARNING: \`git svn\` is no longer supported by the Git for Windows project.", + "See https://github.com/git-for-windows/git/issues/5405 for details." +); + my $cmd; for (my $i = 0; $i < @ARGV; $i++) { if (defined $cmd{$ARGV[$i]}) { diff --git a/http.c b/http.c index edf2b349d9..0b20b08e67 100644 --- a/http.c +++ b/http.c @@ -162,6 +162,7 @@ static long http_retry_after = 0; static long http_max_retries = 0; static long http_max_retry_time = 300; + /* * With the backend being set to `schannel`, setting sslCAinfo would override * the Certificate Store in cURL v7.60.0 and later, which is not what we want diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh index d5939d4753..b867c5504f 100755 --- a/t/t9108-git-svn-glob.sh +++ b/t/t9108-git-svn-glob.sh @@ -110,7 +110,8 @@ test_expect_success 'test disallow multi-globs' ' svn_cmd commit -m "try to try" ) && test_must_fail git svn fetch three 2> stderr.three && - test_cmp expect.three stderr.three + sed "/^WARNING.*no.* supported/{N;d}" stderr.three.clean && + test_cmp expect.three stderr.three.clean ' test_done diff --git a/t/t9109-git-svn-multi-glob.sh b/t/t9109-git-svn-multi-glob.sh index 648dcee1ea..ebf34abcc3 100755 --- a/t/t9109-git-svn-multi-glob.sh +++ b/t/t9109-git-svn-multi-glob.sh @@ -161,7 +161,8 @@ test_expect_success 'test disallow multiple globs' ' svn_cmd commit -m "try to try" ) && test_must_fail git svn fetch three 2> stderr.three && - test_cmp expect.three stderr.three + sed "/^WARNING.*no.* supported/{N;d}" stderr.three.clean && + test_cmp expect.three stderr.three.clean ' test_done diff --git a/t/t9168-git-svn-partially-globbed-names.sh b/t/t9168-git-svn-partially-globbed-names.sh index 854b3419b2..59be2eaf0f 100755 --- a/t/t9168-git-svn-partially-globbed-names.sh +++ b/t/t9168-git-svn-partially-globbed-names.sh @@ -155,7 +155,8 @@ test_expect_success 'test disallow prefixed multi-globs' ' svn_cmd commit -m "try to try" ) && test_must_fail git svn fetch four 2>stderr.four && - test_cmp expect.four stderr.four && + sed "/^WARNING.*no.* supported/{N;d}" stderr.four.clean && + test_cmp expect.four stderr.four.clean && git config --unset svn-remote.four.branches && git config --unset svn-remote.four.tags ' @@ -223,7 +224,8 @@ test_expect_success 'test disallow multiple asterisks in one word' ' svn_cmd commit -m "try to try" ) && test_must_fail git svn fetch six 2>stderr.six && - test_cmp expect.six stderr.six + sed "/^WARNING.*no.* supported/{N;d}" stderr.six.clean && + test_cmp expect.six stderr.six.clean ' test_done