From 209363b3eb4facb36ebbfb0c09d48caa5d390b8c Mon Sep 17 00:00:00 2001 From: Wesley Schwengle Date: Thu, 27 Aug 2026 19:43:44 -0400 Subject: [PATCH 1/2] git-svn: don't print v1-layout migration noise when there's nothing to migrate `migrate_from_v1()' unconditionally announced and created `.git/svn' when no legacy `refs/remotes/*' metadata existed to migrate. This happens for example right after a `git init'. Defer the logic until an actual candidate is found, matching the existing pattern of `migrate_from_v0' Signed-off-by: Wesley Schwengle Signed-off-by: Junio C Hamano --- perl/Git/SVN/Migration.pm | 16 ++++++++++------ t/t9107-git-svn-migrate.sh | 7 +++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm index ed96ac593e..65f6b393a0 100644 --- a/perl/Git/SVN/Migration.pm +++ b/perl/Git/SVN/Migration.pm @@ -91,11 +91,6 @@ sub migrate_from_v1 { # just in case somebody used 'svn' as their $id at some point... return $migrated if -d $svn_dir && ! -f "$svn_dir/info/url"; - print STDERR "Migrating from a git-svn v1 layout...\n"; - mkpath([$svn_dir]); - print STDERR "Data from a previous version of git-svn exists, but\n\t", - "$svn_dir\n\t(required for this version ", - "($::VERSION) of git-svn) does not exist.\n"; my ($fh, $ctx) = command_output_pipe(qw/rev-parse --symbolic --all/); while (<$fh>) { my $x = $_; @@ -106,6 +101,15 @@ sub migrate_from_v1 { next unless -f $info_url; my $u = eval { ::file_to_s($info_url) }; next unless $u; + unless ($migrated) { + print STDERR "Migrating from a git-svn v1 layout...\n"; + mkpath([$svn_dir]); + print STDERR "Data from a previous version of ", + "git-svn exists, but\n\t", + "$svn_dir\n\t(required for this version ", + "($::VERSION) of git-svn) does not ", + "exist.\n"; + } my $dn = dirname("$svn_dir/$x"); mkpath([$dn]) unless -d $dn; if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID: @@ -127,7 +131,7 @@ sub migrate_from_v1 { $migrated++; } command_close_pipe($fh, $ctx); - print STDERR "Done migrating from a git-svn v1 layout\n"; + print STDERR "Done migrating from a git-svn v1 layout\n" if $migrated; $migrated; } diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh index aa908bbc2f..49e4f4774b 100755 --- a/t/t9107-git-svn-migrate.sh +++ b/t/t9107-git-svn-migrate.sh @@ -3,6 +3,13 @@ test_description='git svn metadata migrations from previous versions' . ./lib-git-svn.sh +test_expect_success 'migrate is silent when there is nothing to migrate' ' + git svn migrate 2>err.log && + test_grep ! "Migrating from a git-svn v1 layout" err.log && + test_grep ! "Data from a previous version of git-svn exists" err.log && + ! test -d "$GIT_DIR"/svn + ' + test_expect_success 'setup old-looking metadata' ' cp "$GIT_DIR"/config "$GIT_DIR"/config-old-git-svn && mkdir import && From c618e8f8bd07dbefd44e717bff5864ff04e0e52d Mon Sep 17 00:00:00 2001 From: Wesley Schwengle Date: Thu, 27 Aug 2026 19:43:45 -0400 Subject: [PATCH 2/2] Makefile: add NO_GIT_SVN knob to skip building/installing git-svn This option also implies that NO_SVN_TESTS is enabled. Signed-off-by: Wesley Schwengle Signed-off-by: Junio C Hamano --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index cedc234173..616d904429 100644 --- a/Makefile +++ b/Makefile @@ -88,6 +88,9 @@ include shared.mak # tests. These tests take up a significant amount of the total test time # but are not needed unless you plan to talk to SVN repos. # +# Define NO_GIT_SVN if you don't want git-svn built or installed at all. +# Implies NO_SVN_TESTS. +# # Define NO_FINK if you are building on Darwin/Mac OS X, have Fink # installed in /sw, but don't want GIT to link against any libraries # installed there. If defined you may specify your own (or Fink's) @@ -744,7 +747,9 @@ SCRIPT_PERL += git-cvsexportcommit.perl SCRIPT_PERL += git-cvsimport.perl SCRIPT_PERL += git-cvsserver.perl SCRIPT_PERL += git-send-email.perl +ifndef NO_GIT_SVN SCRIPT_PERL += git-svn.perl +endif SCRIPT_PYTHON += git-p4.py @@ -3382,6 +3387,9 @@ $(test_bindir_programs): bin-wrappers/%: bin-wrappers/wrap-for-bin.sh # However, the environment gets quite big, and some programs have problems # with that. +ifdef NO_GIT_SVN +NO_SVN_TESTS = YesPlease +endif export NO_SVN_TESTS export TEST_NO_MALLOC_CHECK