undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.bogomips.org/git-svn

Browse Source 
* git://git.bogomips.org/git-svn:
  git-svn: add a double quiet option to hide git commits
This commit is contained in:
Junio C Hamano 2009-04-01 10:57:48 -07:00
commit 91286ca61a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-svn.txt
View File

@ -385,7 +385,8 @@ config key: svn.authorsfile
-q:: -q::
--quiet:: --quiet::
Make 'git-svn' less verbose. Make 'git-svn' less verbose. Specify a second time to make it
even less verbose.
--repack[=<n>]:: --repack[=<n>]::
--repack-flags=<flags>:: --repack-flags=<flags>::

9
git-svn.perl
View File

@ -68,6 +68,7 @@ my ($_stdin, $_help, $_edit,
$_prefix, $_no_checkout, $_url, $_verbose, $_prefix, $_no_checkout, $_url, $_verbose,
$_git_format, $_commit_url, $_tag); $_git_format, $_commit_url, $_tag);
$Git::SVN::_follow_parent = 1; $Git::SVN::_follow_parent = 1;
$_q ||= 0;
my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username, my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
'config-dir=s' => \$Git::SVN::Ra::config_dir, 'config-dir=s' => \$Git::SVN::Ra::config_dir,
'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache, 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
@ -80,7 +81,7 @@ my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props, 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
'log-window-size=i' => \$Git::SVN::Ra::_log_window_size, 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
'no-checkout' => \$_no_checkout, 'no-checkout' => \$_no_checkout,
'quiet|q' => \$_q, 'quiet|q+' => \$_q,
'repack-flags|repack-args|repack-opts=s' => 'repack-flags|repack-args|repack-opts=s' =>
\$Git::SVN::_repack_flags, \$Git::SVN::_repack_flags,
'use-log-author' => \$Git::SVN::_use_log_author, 'use-log-author' => \$Git::SVN::_use_log_author,
@ -2331,13 +2332,13 @@ sub do_git_commit {
$self->{last_rev} = $log_entry->{revision}; $self->{last_rev} = $log_entry->{revision};
$self->{last_commit} = $commit; $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}) { 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, $self->rev_map_set($log_entry->{svm_revision}, $commit,
0, $self->svm_uuid); 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) { if (--$_gc_nr == 0) {
$_gc_nr = $_gc_period; $_gc_nr = $_gc_period;
gc(); gc();