Re: [PATCH] Teach/Fix pull/fetch -q/-v options

From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Nov 15, 2008, 00:09 UTC
Message-ID: <4ac8254d0811141609k66b7bd6et8a09a64c11ad38f4@mail.gmail.com>
In-Reply-To: <7vy6zon02o.fsf@gitster.siamese.dyndns.org>

On Wed, Nov 12, 2008 at 9:47 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines

> "Tuncer Ayaz" <tuncer.ayaz@gmail.com> writes:
>
>> On Fri, Nov 7, 2008 at 4:26 AM, Tuncer Ayaz <tuncer.ayaz@gmail.com> wrote:
>>> Implement git-pull --quiet and git-pull --verbose by
>>> adding the options to git-pull and fixing verbosity
>>> handling in git-fetch.
>>
>> Junio,
>>
>> is there anything still missing in this patch?
>> Maybe the name of the test-case is bad.
>
> It seems to break t7600.

thanks for the good review, it sure does break.

I hadn't noticed it as I didn't compare test results of master against my branch and assumed that that breakage is part of common failing tests.

Shawn helped me out a little bit with debugging the test scripts
and I quickly found out that an if clause is wrong.
the diff for the last patch to correct it is:
 --- a/builtin-merge.c
 +++ b/builtin-merge.c
 @@ -50,6 +50,7 @@ static unsigned char head[20], stash[20];

@@ -163,7 +144,7 @@

        argc = parse_options(argc, argv, builtin_merge_options,
                        builtin_merge_usage, 0);
-+      if (verbosity > QUIET)
++      if (verbosity == QUIET)
 +              show_diffstat = 0;


a corrected patch will arrive here in a minute.