From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Shawn O. Pearce" <spearce@spearce.org>
Subject: Re: [PATCH resend again] gitk: Do not pick up file names of "copy from" lines
Date: Fri, 19 Oct 2007 03:32:53 -0400
Message-ID: <20071019073253.GM14735@spearce.org>
References: <20071019052823.GI14735@spearce.org> <47185BCC.9010307@viscovery.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Cc: Paul Mackerras <paulus@samba.org>, git@vger.kernel.org
To: Johannes Sixt <j.sixt@viscovery.net>
X-From: git-owner@vger.kernel.org Fri Oct 19 09:35:30 2007
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1IimOD-0008Qf-AA
	for gcvg-git-2@gmane.org; Fri, 19 Oct 2007 09:35:25 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1764167AbXJSHc6 (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Fri, 19 Oct 2007 03:32:58 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763744AbXJSHc6
	(ORCPT <rfc822;git-outgoing>); Fri, 19 Oct 2007 03:32:58 -0400
Received: from corvette.plexpod.net ([64.38.20.226]:50731 "EHLO
	corvette.plexpod.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1763510AbXJSHc5 (ORCPT <rfc822;git@vger.kernel.org>);
	Fri, 19 Oct 2007 03:32:57 -0400
Received: from [74.70.48.173] (helo=asimov.home.spearce.org)
	by corvette.plexpod.net with esmtpa (Exim 4.68)
	(envelope-from <spearce@spearce.org>)
	id 1IimLl-0003o2-JU; Fri, 19 Oct 2007 03:32:53 -0400
Received: by asimov.home.spearce.org (Postfix, from userid 1000)
	id CCF8320FBAE; Fri, 19 Oct 2007 03:32:53 -0400 (EDT)
Content-Disposition: inline
In-Reply-To: <47185BCC.9010307@viscovery.net>
User-Agent: Mutt/1.5.11
X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
X-AntiAbuse: Primary Hostname - corvette.plexpod.net
X-AntiAbuse: Original Domain - vger.kernel.org
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - spearce.org
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/61663>

Johannes Sixt <j.sixt@viscovery.net> wrote:
>  Would you mind putting this one into your queue, too? I haven't seen it
>  appear in Paul's repo.

I think it is already in Paul's repo:

  Applying gitk: Do not pick up file names of "copy from" lines
  error: patch failed: gitk:5216
  error: gitk: patch does not apply
  fatal: sha1 information is lacking or useless (gitk).
  Repository lacks necessary blobs to fall back on 3-way merge.
  Cannot fall back to three-way merge.
  Patch failed at 0001.
  When you have resolved this problem run "git-am -3 --resolved".
  If you would prefer to skip this patch, instead run "git-am -3 --skip".
 
> diff --git a/gitk b/gitk
> index b3ca704..1306382 100755
> --- a/gitk
> +++ b/gitk
> @@ -5216,8 +5216,7 @@ proc getblobdiffline {bdf ids} {
>  	    set diffinhdr 0
> 
>  	} elseif {$diffinhdr} {
> -	    if {![string compare -length 12 "rename from " $line] ||
> -		![string compare -length 10 "copy from " $line]} {
> +	    if {![string compare -length 12 "rename from " $line]} {
>  		set fname [string range $line [expr 6 + [string first " from 
>  		" $line] ] end]
>  		if {[string index $fname 0] eq "\""} {
>  		    set fname [lindex $fname 0]

-- 
Shawn.