{"thread":{"id":"23093","subject":"[gitk PATCH] gitk: Disable log.decorate config","startedAt":"2010-03-19T22:44:23Z","lastAt":"2010-03-20T11:39:32Z","messageCount":4,"participants":["Santi Béjar","Paul Mackerras","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"137278","messageId":"1269038663-11025-1-git-send-email-santi@agolina.net","threadId":"23093","inReplyTo":null,"subject":"[gitk PATCH] gitk: Disable log.decorate config","fromName":"Santi Béjar","fromEmail":"santi@agolina.net","sentAt":"2010-03-19T22:44:23Z","receivedAt":"2010-03-19T22:44:23Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"Since eb73445 (Add `log.decorate' configuration variable., 2010-02-17)\nthe log output changes if log.decorate is set. Gitk is unable to\nunderstand the new output (it returns the error: \"Can't parse git log\noutput: {commit $sha1 $sha2...}), so disable it with --no-decorate.\n\nSigned-off-by: Santi Béjar <santi@agolina.net>\n---\n gitk |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex 1f36a3e..aca44b7 100755\n--- a/gitk\n+++ b/gitk\n@@ -362,7 +362,7 @@ proc start_rev_list {view} {\n \n     if {[catch {\n \tset fd [open [concat | git log --no-color -z --pretty=raw --parents \\\n-\t\t\t --boundary $args \"--\" $files] r]\n+\t\t\t --boundary --no-decorate $args \"--\" $files] r]\n     } err]} {\n \terror_popup \"[mc \"Error executing git log:\"] $err\"\n \treturn 0\n-- \n1.7.0.2.384.g015e\n"},{"id":"137305","messageId":"20100320051055.GA3855@brick.ozlabs.ibm.com","threadId":"23093","inReplyTo":"1269038663-11025-1-git-send-email-santi@agolina.net","subject":"Re: [gitk PATCH] gitk: Disable log.decorate config","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2010-03-20T05:10:55Z","receivedAt":"2010-03-20T05:10:55Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"On Fri, Mar 19, 2010 at 11:44:23PM +0100, Santi Béjar wrote:\n\n> Since eb73445 (Add `log.decorate' configuration variable., 2010-02-17)\n> the log output changes if log.decorate is set. Gitk is unable to\n> understand the new output (it returns the error: \"Can't parse git log\n> output: {commit $sha1 $sha2...}), so disable it with --no-decorate.\n> \n> Signed-off-by: Santi Béjar <santi@agolina.net>\n> ---\n>  gitk |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/gitk b/gitk\n> index 1f36a3e..aca44b7 100755\n> --- a/gitk\n> +++ b/gitk\n> @@ -362,7 +362,7 @@ proc start_rev_list {view} {\n>  \n>      if {[catch {\n>  \tset fd [open [concat | git log --no-color -z --pretty=raw --parents \\\n> -\t\t\t --boundary $args \"--\" $files] r]\n> +\t\t\t --boundary --no-decorate $args \"--\" $files] r]\n\nWe'll need to make that conditional on the git version, since we want\ngitk to continue to work on older git installations.\n\nPaul.\n"},{"id":"137310","messageId":"20100320053404.GA12625@coredump.intra.peff.net","threadId":"23093","inReplyTo":"1269038663-11025-1-git-send-email-santi@agolina.net","subject":"Re: [gitk PATCH] gitk: Disable log.decorate config","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2010-03-20T05:34:04Z","receivedAt":"2010-03-20T05:34:04Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Mar 19, 2010 at 11:44:23PM +0100, Santi Béjar wrote:\n\n> Since eb73445 (Add `log.decorate' configuration variable., 2010-02-17)\n> the log output changes if log.decorate is set. Gitk is unable to\n> understand the new output (it returns the error: \"Can't parse git log\n> output: {commit $sha1 $sha2...}), so disable it with --no-decorate.\n\nlog.decorate is still in \"next\". My understanding was that it was not\ngoing to graduate to \"master\" until this issue had been resolved, and\nthat the current plan was to disable config decoration for --pretty=raw.\nThat would solve the issue without any effort on the part of gitk.\n\n-Peff\n"},{"id":"137326","messageId":"adf1fd3d1003200439o52d45632v7096b6bef64f744b@mail.gmail.com","threadId":"23093","inReplyTo":"20100320051055.GA3855@brick.ozlabs.ibm.com","subject":"Re: [gitk PATCH] gitk: Disable log.decorate config","fromName":"Santi Béjar","fromEmail":"santi@agolina.net","sentAt":"2010-03-20T11:39:32Z","receivedAt":"2010-03-20T11:39:32Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"On Sat, Mar 20, 2010 at 6:10 AM, Paul Mackerras <paulus@samba.org> wrote:\n> On Fri, Mar 19, 2010 at 11:44:23PM +0100, Santi Béjar wrote:\n>\n>> Since eb73445 (Add `log.decorate' configuration variable., 2010-02-17)\n>> the log output changes if log.decorate is set. Gitk is unable to\n>> understand the new output (it returns the error: \"Can't parse git log\n>> output: {commit $sha1 $sha2...}), so disable it with --no-decorate.\n>>\n>> Signed-off-by: Santi Béjar <santi@agolina.net>\n>> ---\n>>  gitk |    2 +-\n>>  1 files changed, 1 insertions(+), 1 deletions(-)\n>>\n>> diff --git a/gitk b/gitk\n>> index 1f36a3e..aca44b7 100755\n>> --- a/gitk\n>> +++ b/gitk\n>> @@ -362,7 +362,7 @@ proc start_rev_list {view} {\n>>\n>>      if {[catch {\n>>       set fd [open [concat | git log --no-color -z --pretty=raw --parents \\\n>> -                      --boundary $args \"--\" $files] r]\n>> +                      --boundary --no-decorate $args \"--\" $files] r]\n>\n> We'll need to make that conditional on the git version, since we want\n> gitk to continue to work on older git installations.\n\nI see. I didn't find a version check for the --no-color (I know it is\nmuch older, but still), so I did the same.\n\nBut as Jeff said it will be solved within git itself.\n\nSanti\n"}]}