Skip to content

Commit 91286ca

Browse files
committed
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: git-svn: add a double quiet option to hide git commits
2 parents 50b5f42 + 49750f3 commit 91286ca

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Documentation/git-svn.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,8 @@ config key: svn.authorsfile
385385

386386
-q::
387387
--quiet::
388-
Make 'git-svn' less verbose.
388+
Make 'git-svn' less verbose. Specify a second time to make it
389+
even less verbose.
389390

390391
--repack[=<n>]::
391392
--repack-flags=<flags>::

git-svn.perl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ BEGIN
6868
$_prefix, $_no_checkout, $_url, $_verbose,
6969
$_git_format, $_commit_url, $_tag);
7070
$Git::SVN::_follow_parent = 1;
71+
$_q ||= 0;
7172
my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
7273
'config-dir=s' => \$Git::SVN::Ra::config_dir,
7374
'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
@@ -80,7 +81,7 @@ BEGIN
8081
'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
8182
'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
8283
'no-checkout' => \$_no_checkout,
83-
'quiet|q' => \$_q,
84+
'quiet|q+' => \$_q,
8485
'repack-flags|repack-args|repack-opts=s' =>
8586
\$Git::SVN::_repack_flags,
8687
'use-log-author' => \$Git::SVN::_use_log_author,
@@ -2331,13 +2332,13 @@ sub do_git_commit {
23312332

23322333
$self->{last_rev} = $log_entry->{revision};
23332334
$self->{last_commit} = $commit;
2334-
print "r$log_entry->{revision}" unless $::_q;
2335+
print "r$log_entry->{revision}" unless $::_q > 1;
23352336
if (defined $log_entry->{svm_revision}) {
2336-
print " (\@$log_entry->{svm_revision})" unless $::_q;
2337+
print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
23372338
$self->rev_map_set($log_entry->{svm_revision}, $commit,
23382339
0, $self->svm_uuid);
23392340
}
2340-
print " = $commit ($self->{ref_id})\n" unless $::_q;
2341+
print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
23412342
if (--$_gc_nr == 0) {
23422343
$_gc_nr = $_gc_period;
23432344
gc();

0 commit comments

Comments
 (0)