Skip to content

Commit

Permalink
git-svn: add a double quiet option to hide git commits
Browse files Browse the repository at this point in the history
People may expect/prefer -q to still show git commits,
so this change allows a second -q to hide them.

Signed-off-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Acked-by: Eric Wong <normalperson@yhbt.net>
  • Loading branch information
Simon Arlott authored and Eric Wong committed Mar 31, 2009
1 parent 442dd42 commit 49750f3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Documentation/git-svn.txt
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,8 @@ config key: svn.authorsfile

-q::
--quiet::
Make 'git-svn' less verbose.
Make 'git-svn' less verbose. Specify a second time to make it
even less verbose.

--repack[=<n>]::
--repack-flags=<flags>::
Expand Down
9 changes: 5 additions & 4 deletions git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ BEGIN
$_prefix, $_no_checkout, $_url, $_verbose,
$_git_format, $_commit_url, $_tag);
$Git::SVN::_follow_parent = 1;
$_q ||= 0;
my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
'config-dir=s' => \$Git::SVN::Ra::config_dir,
'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
Expand All @@ -80,7 +81,7 @@ BEGIN
'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
'no-checkout' => \$_no_checkout,
'quiet|q' => \$_q,
'quiet|q+' => \$_q,
'repack-flags|repack-args|repack-opts=s' =>
\$Git::SVN::_repack_flags,
'use-log-author' => \$Git::SVN::_use_log_author,
Expand Down Expand Up @@ -2331,13 +2332,13 @@ sub do_git_commit {

$self->{last_rev} = $log_entry->{revision};
$self->{last_commit} = $commit;
print "r$log_entry->{revision}" unless $::_q;
print "r$log_entry->{revision}" unless $::_q > 1;
if (defined $log_entry->{svm_revision}) {
print " (\@$log_entry->{svm_revision})" unless $::_q;
print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
$self->rev_map_set($log_entry->{svm_revision}, $commit,
0, $self->svm_uuid);
}
print " = $commit ($self->{ref_id})\n" unless $::_q;
print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
if (--$_gc_nr == 0) {
$_gc_nr = $_gc_period;
gc();
Expand Down

0 comments on commit 49750f3

Please sign in to comment.