Skip to content

Commit f881bb5

Browse files
dschoGit for Windows Build Agent
authored andcommitted
git svn: remove deprecation note (since it is no longer included in Git for Windows, anyway) (#6142)
As of git-for-windows/MINGW-packages#187, Git for Windows no longer includes `git svn` in its installers and portable Git editions. As a consequence, the deprecation note is no longer necessary. Even worse: Since the recommendation for users who want (or at least need) to continue using `git svn` is to use the MSYS2 package instead, and that MSYS2 package is built from Git for Windows' source code, they would now be bothered by a note that they do not need. So let's drop that deprecation note.
2 parents 62b7bbc + 1554e8c commit f881bb5

File tree

5 files changed

+4
-22
lines changed

5 files changed

+4
-22
lines changed

Documentation/git-svn.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ SYNOPSIS
99
--------
1010
[verse]
1111
'git svn' <command> [<options>] [<arguments>]
12-
(UNSUPPORTED!)
1312

1413
DESCRIPTION
1514
-----------

git-svn.perl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -305,19 +305,6 @@ sub term_init {
305305
: new Term::ReadLine 'git-svn';
306306
}
307307

308-
sub deprecated_warning {
309-
my @lines = @_;
310-
if (-t STDERR) {
311-
@lines = map { "\e[33m$_\e[0m" } @lines;
312-
}
313-
warn join("\n", @lines), "\n";
314-
}
315-
316-
deprecated_warning(
317-
"WARNING: \`git svn\` is no longer supported by the Git for Windows project.",
318-
"See https://github.com/git-for-windows/git/issues/5405 for details."
319-
);
320-
321308
my $cmd;
322309
for (my $i = 0; $i < @ARGV; $i++) {
323310
if (defined $cmd{$ARGV[$i]}) {

t/t9108-git-svn-glob.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ test_expect_success 'test disallow multi-globs' '
110110
svn_cmd commit -m "try to try"
111111
) &&
112112
test_must_fail git svn fetch three 2> stderr.three &&
113-
sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean &&
114-
test_cmp expect.three stderr.three.clean
113+
test_cmp expect.three stderr.three
115114
'
116115

117116
test_done

t/t9109-git-svn-multi-glob.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ test_expect_success 'test disallow multiple globs' '
161161
svn_cmd commit -m "try to try"
162162
) &&
163163
test_must_fail git svn fetch three 2> stderr.three &&
164-
sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean &&
165-
test_cmp expect.three stderr.three.clean
164+
test_cmp expect.three stderr.three
166165
'
167166

168167
test_done

t/t9168-git-svn-partially-globbed-names.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ test_expect_success 'test disallow prefixed multi-globs' '
155155
svn_cmd commit -m "try to try"
156156
) &&
157157
test_must_fail git svn fetch four 2>stderr.four &&
158-
sed "/^WARNING.*no.* supported/{N;d}" <stderr.four >stderr.four.clean &&
159-
test_cmp expect.four stderr.four.clean &&
158+
test_cmp expect.four stderr.four &&
160159
git config --unset svn-remote.four.branches &&
161160
git config --unset svn-remote.four.tags
162161
'
@@ -224,8 +223,7 @@ test_expect_success 'test disallow multiple asterisks in one word' '
224223
svn_cmd commit -m "try to try"
225224
) &&
226225
test_must_fail git svn fetch six 2>stderr.six &&
227-
sed "/^WARNING.*no.* supported/{N;d}" <stderr.six >stderr.six.clean &&
228-
test_cmp expect.six stderr.six.clean
226+
test_cmp expect.six stderr.six
229227
'
230228

231229
test_done

0 commit comments

Comments
 (0)