threads / patch / 23093

patchgitk: Disable log.decorate config

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

## tl;dr

4 messages between Mar 19, 2010 and Mar 20, 2010. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Santi Béjar· Mar 19, 2010, 22:44 UTC · lore

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(-)

Show changes to gitk +1 −1

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]
     } err]} {
 	error_popup "[mc "Error executing git log:"] $err"
 	return 0

-- 
1.7.0.2.384.g015e

Paul Mackerras· Mar 20, 2010, 05:10 UTC · re: Santi Béjar · lore

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

On Fri, Mar 19, 2010 at 11:44:23PM +0100, Santi Béjar wrote:

Show 20 quoted lines

> 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.

Paul.

Santi Béjar· Mar 20, 2010, 11:39 UTC · re: Paul Mackerras · lore

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

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

Jeff King· Mar 20, 2010, 05:34 UTC · re: Santi Béjar · lore

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

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.

log.decorate is still in "next". My understanding was that it was not going to graduate to "master" until this issue had been resolved, and that the current plan was to disable config decoration for --pretty=raw. That would solve the issue without any effort on the part of gitk.

-Peff