Re: [gitk PATCH] gitk: Disable log.decorate config

From: Santi Béjar <santi@agolina.net>
Date: Mar 20, 2010, 11:39 UTC
Message-ID: <adf1fd3d1003200439o52d45632v7096b6bef64f744b@mail.gmail.com>
In-Reply-To: <20100320051055.GA3855@brick.ozlabs.ibm.com>

On Sat, Mar 20, 2010 at 6:10 AM, Paul Mackerras <paulus@samba.org> wrote:

Show 25 quoted lines

> On Fri, Mar 19, 2010 at 11:44:23PM +0100, Santi Béjar wrote:
>
>> Since eb73445 (Add `log.decorate' configuration variable., 2010-02-17)
>> the log output changes if log.decorate is set. Gitk is unable to
>> understand the new output (it returns the error: "Can't parse git log
>> output: {commit $sha1 $sha2...}), so disable it with --no-decorate.
>>
>> Signed-off-by: Santi Béjar <santi@agolina.net>
>> ---
>>  gitk |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/gitk b/gitk
>> index 1f36a3e..aca44b7 100755
>> --- a/gitk
>> +++ b/gitk
>> @@ -362,7 +362,7 @@ proc start_rev_list {view} {
>>
>>      if {[catch {
>>       set fd [open [concat | git log --no-color -z --pretty=raw --parents \
>> -                      --boundary $args "--" $files] r]
>> +                      --boundary --no-decorate $args "--" $files] r]
>
> We'll need to make that conditional on the git version, since we want
> gitk to continue to work on older git installations.

I see. I didn't find a version check for the --no-color (I know it is much older, but still), so I did the same.

But as Jeff said it will be solved within git itself.

Santi