Re: [PATCH resend again] gitk: Do not pick up file names of "copy from" lines
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".
Show 15 quoted lines
> 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.
Shawn O. Pearce <spearce@spearce.org>