Re: [PATCH] git-svn: forward -q to git-rebase
On Tue, Jun 12, 2012 at 10:39 PM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
Show 28 quoted lines
> On Tue, Jun 12, 2012 at 10:23 PM, Erik Faye-Lund <kusmabite@gmail.com> wrote:
>> On Tue, Jun 12, 2012 at 6:54 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>> Erik Faye-Lund <kusmabite@gmail.com> writes:
>>>
>>>> When calling "git svn rebase -q", we still get the message
>>>> "Current branch BRANCHNAME is up to date." from git-rebase, which
>>>> isn't quite as quiet as we could be.
>>>>
>>>> Fix this by forwarding the -q flag to git-rebase.
>>>>
>>>> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
>>>> ---
>>>>
>>>> I just set up a cronjob that did a "git svn rebase -q", and noticed
>>>> it triggered cron to send me an e-mail every time.
>>>>
>>>> Since I'm not really interested in getting an e-mail every time the
>>>> script does nothing, but I'd like the option to get an e-mail whenever
>>>> it does something useful, perhaps something like this can benefit
>>>> other people as well?
>>>
>>> If it matches what you would get from "git pull -q" run in a
>>> cronjob, I would say that is a sensible change to make.
>>
>> Seems like it to me in my tests, yeah.
>
> Hm, but not the same as "git pull --rebase -q", as git-pull.sh doesn't
> forward $verbosity to "git rebase" either.
The obvious fix to that (if we decide it needs fixing, that is), is this:
diff --git a/git-pull.sh b/git-pull.sh
index 2a10047..2920c69 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -278,7 +278,7 @@ fi
merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
case "$rebase" in
true)
- eval="git-rebase $diffstat $strategy_args $merge_args"
+ eval="git-rebase $diffstat $strategy_args $merge_args $verbosity"
eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
;;
*)
Erik Faye-Lund <kusmabite@gmail.com>