From: Paul Mackerras <paulus@samba.org>
Date: Sat, 20 Mar 2010 05:10:55 GMT
Subject: Re: [gitk PATCH] gitk: Disable log.decorate config
Message-ID: <20100320051055.GA3855@brick.ozlabs.ibm.com>
In-Reply-To: <1269038663-11025-1-git-send-email-santi@agolina.net>

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.

Paul.