{"thread":{"id":"30781","subject":"[PATCH] git-svn: forward -q to git-rebase","startedAt":"2012-06-12T15:43:35Z","lastAt":"2012-06-12T21:38:05Z","messageCount":6,"participants":["Erik Faye-Lund","Junio C Hamano","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"193455","messageId":"1339515815-10752-1-git-send-email-kusmabite@gmail.com","threadId":"30781","inReplyTo":null,"subject":"[PATCH] git-svn: forward -q to git-rebase","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2012-06-12T15:43:35Z","receivedAt":"2012-06-12T15:43:35Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"When calling \"git svn rebase -q\", we still get the message\n\"Current branch BRANCHNAME is up to date.\" from git-rebase, which\nisn't quite as quiet as we could be.\n\nFix this by forwarding the -q flag to git-rebase.\n\nSigned-off-by: Erik Faye-Lund \n---\n\nI just set up a cronjob that did a \"git svn rebase -q\", and noticed\nit triggered cron to send me an e-mail every time.\n\nSince I'm not really interested in getting an e-mail every time the\nscript does nothing, but I'd like the option to get an e-mail whenever\nit does something useful, perhaps something like this can benefit\nother people as well?\n\n git-svn.perl | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 0b074c4..34baa43 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -1590,6 +1590,7 @@ sub cmd_gc {\n sub rebase_cmd {\n \tmy @cmd = qw/rebase/;\n \tpush @cmd, '-v' if $_verbose;\n+\tpush @cmd, '-q' if $_q;\n \tpush @cmd, qw/--merge/ if $_merge;\n \tpush @cmd, \"--strategy=$_strategy\" if $_strategy;\n \tpush @cmd, \"--preserve-merges\" if $_preserve_merges;\n-- \n1.7.11.rc2.5.g68f532f.dirty\n"},{"id":"193462","messageId":"7vd354jwss.fsf@alter.siamese.dyndns.org","threadId":"30781","inReplyTo":"1339515815-10752-1-git-send-email-kusmabite@gmail.com","subject":"Re: [PATCH] git-svn: forward -q to git-rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-06-12T16:54:11Z","receivedAt":"2012-06-12T16:54:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Erik Faye-Lund writes:\n\n> When calling \"git svn rebase -q\", we still get the message\n> \"Current branch BRANCHNAME is up to date.\" from git-rebase, which\n> isn't quite as quiet as we could be.\n>\n> Fix this by forwarding the -q flag to git-rebase.\n>\n> Signed-off-by: Erik Faye-Lund \n> ---\n>\n> I just set up a cronjob that did a \"git svn rebase -q\", and noticed\n> it triggered cron to send me an e-mail every time.\n>\n> Since I'm not really interested in getting an e-mail every time the\n> script does nothing, but I'd like the option to get an e-mail whenever\n> it does something useful, perhaps something like this can benefit\n> other people as well?\n\nIf it matches what you would get from \"git pull -q\" run in a\ncronjob, I would say that is a sensible change to make.\n\n> git-svn.perl | 1 +\n> 1 file changed, 1 insertion(+)\n>\n> diff --git a/git-svn.perl b/git-svn.perl\n> index 0b074c4..34baa43 100755\n> --- a/git-svn.perl\n> +++ b/git-svn.perl\n> @@ -1590,6 +1590,7 @@ sub cmd_gc {\n> sub rebase_cmd {\n> \tmy @cmd = qw/rebase/;\n> \tpush @cmd, '-v' if $_verbose;\n> +\tpush @cmd, '-q' if $_q;\n> \tpush @cmd, qw/--merge/ if $_merge;\n> \tpush @cmd, \"--strategy=$_strategy\" if $_strategy;\n> \tpush @cmd, \"--preserve-merges\" if $_preserve_merges;\n"},{"id":"193497","messageId":"CABPQNSYxq1cSYKi+fGajoASL6x7e6VCaSDoWNmYuEHSgt8NFBA@mail.gmail.com","threadId":"30781","inReplyTo":"7vd354jwss.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] git-svn: forward -q to git-rebase","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2012-06-12T20:23:46Z","receivedAt":"2012-06-12T20:23:46Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Tue, Jun 12, 2012 at 6:54 PM, Junio C Hamano wrote:\n> Erik Faye-Lund writes:\n>\n>> When calling \"git svn rebase -q\", we still get the message\n>> \"Current branch BRANCHNAME is up to date.\" from git-rebase, which\n>> isn't quite as quiet as we could be.\n>>\n>> Fix this by forwarding the -q flag to git-rebase.\n>>\n>> Signed-off-by: Erik Faye-Lund \n>> ---\n>>\n>> I just set up a cronjob that did a \"git svn rebase -q\", and noticed\n>> it triggered cron to send me an e-mail every time.\n>>\n>> Since I'm not really interested in getting an e-mail every time the\n>> script does nothing, but I'd like the option to get an e-mail whenever\n>> it does something useful, perhaps something like this can benefit\n>> other people as well?\n>\n> If it matches what you would get from \"git pull -q\" run in a\n> cronjob, I would say that is a sensible change to make.\n\nSeems like it to me in my tests, yeah.\n"},{"id":"193501","messageId":"CABPQNSZN7zzF4rki38x3PHXT2DZhOjUtUVGNx2mY-wnQtCj-pA@mail.gmail.com","threadId":"30781","inReplyTo":"CABPQNSYxq1cSYKi+fGajoASL6x7e6VCaSDoWNmYuEHSgt8NFBA@mail.gmail.com","subject":"Re: [PATCH] git-svn: forward -q to git-rebase","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2012-06-12T20:39:06Z","receivedAt":"2012-06-12T20:39:06Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Tue, Jun 12, 2012 at 10:23 PM, Erik Faye-Lund wrote:\n> On Tue, Jun 12, 2012 at 6:54 PM, Junio C Hamano wrote:\n>> Erik Faye-Lund writes:\n>>\n>>> When calling \"git svn rebase -q\", we still get the message\n>>> \"Current branch BRANCHNAME is up to date.\" from git-rebase, which\n>>> isn't quite as quiet as we could be.\n>>>\n>>> Fix this by forwarding the -q flag to git-rebase.\n>>>\n>>> Signed-off-by: Erik Faye-Lund \n>>> ---\n>>>\n>>> I just set up a cronjob that did a \"git svn rebase -q\", and noticed\n>>> it triggered cron to send me an e-mail every time.\n>>>\n>>> Since I'm not really interested in getting an e-mail every time the\n>>> script does nothing, but I'd like the option to get an e-mail whenever\n>>> it does something useful, perhaps something like this can benefit\n>>> other people as well?\n>>\n>> If it matches what you would get from \"git pull -q\" run in a\n>> cronjob, I would say that is a sensible change to make.\n>\n> Seems like it to me in my tests, yeah.\n\nHm, but not the same as \"git pull --rebase -q\", as git-pull.sh doesn't\nforward $verbosity to \"git rebase\" either. It DOES pass it to \"git\nmerge\", though... Which puzzles me a bit.\n"},{"id":"193502","messageId":"CABPQNSbJFzOEVSohbrY6GMVsmNFRzrxyTm-MoNr5RJ+2hUBzNQ@mail.gmail.com","threadId":"30781","inReplyTo":"CABPQNSZN7zzF4rki38x3PHXT2DZhOjUtUVGNx2mY-wnQtCj-pA@mail.gmail.com","subject":"Re: [PATCH] git-svn: forward -q to git-rebase","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2012-06-12T20:41:53Z","receivedAt":"2012-06-12T20:41:53Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Tue, Jun 12, 2012 at 10:39 PM, Erik Faye-Lund wrote:\n> On Tue, Jun 12, 2012 at 10:23 PM, Erik Faye-Lund wrote:\n>> On Tue, Jun 12, 2012 at 6:54 PM, Junio C Hamano wrote:\n>>> Erik Faye-Lund writes:\n>>>\n>>>> When calling \"git svn rebase -q\", we still get the message\n>>>> \"Current branch BRANCHNAME is up to date.\" from git-rebase, which\n>>>> isn't quite as quiet as we could be.\n>>>>\n>>>> Fix this by forwarding the -q flag to git-rebase.\n>>>>\n>>>> Signed-off-by: Erik Faye-Lund \n>>>> ---\n>>>>\n>>>> I just set up a cronjob that did a \"git svn rebase -q\", and noticed\n>>>> it triggered cron to send me an e-mail every time.\n>>>>\n>>>> Since I'm not really interested in getting an e-mail every time the\n>>>> script does nothing, but I'd like the option to get an e-mail whenever\n>>>> it does something useful, perhaps something like this can benefit\n>>>> other people as well?\n>>>\n>>> If it matches what you would get from \"git pull -q\" run in a\n>>> cronjob, I would say that is a sensible change to make.\n>>\n>> Seems like it to me in my tests, yeah.\n>\n> Hm, but not the same as \"git pull --rebase -q\", as git-pull.sh doesn't\n> forward $verbosity to \"git rebase\" either.\n\nThe obvious fix to that (if we decide it needs fixing, that is), is this:\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 2a10047..2920c69 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -278,7 +278,7 @@ fi\n merge_name=$(git fmt-merge-msg $log_arg <\"$GIT_DIR/FETCH_HEAD\") || exit\n case \"$rebase\" in\n true)\n-\teval=\"git-rebase $diffstat $strategy_args $merge_args\"\n+\teval=\"git-rebase $diffstat $strategy_args $merge_args $verbosity\"\n \teval=\"$eval --onto $merge_head ${oldremoteref:-$merge_head}\"\n \t;;\n *)\n"},{"id":"193514","messageId":"20120612213805.GA29840@dcvr.yhbt.net","threadId":"30781","inReplyTo":"1339515815-10752-1-git-send-email-kusmabite@gmail.com","subject":"Re: [PATCH] git-svn: forward -q to git-rebase","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2012-06-12T21:38:05Z","receivedAt":"2012-06-12T21:38:05Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Erik Faye-Lund wrote:\n> When calling \"git svn rebase -q\", we still get the message\n> \"Current branch BRANCHNAME is up to date.\" from git-rebase, which\n> isn't quite as quiet as we could be.\n> \n> Fix this by forwarding the -q flag to git-rebase.\n> \n> Signed-off-by: Erik Faye-Lund \n> ---\n\nLooks good to me.\n\nSigned-off-by: Eric Wong \n\nAlso pushed to \"master\" of git://bogomips.org/git-svn\n"}]}