From: "Shawn O. Pearce" <spearce@spearce•org>
To: Johannes Sixt <j.sixt@viscovery•net>
Cc: Paul Mackerras <paulus@samba•org>, git@vger•kernel.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 [thread overview]
Message-ID: <20071019073253.GM14735@spearce.org> (raw)
In-Reply-To: <47185BCC.9010307@viscovery.net>
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.
next prev parent reply other threads:[~2007-10-19 7:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-19 5:28 gitk patch collection pull request Shawn O. Pearce
2007-10-19 7:25 ` [PATCH resend again] gitk: Do not pick up file names of "copy from" lines Johannes Sixt
2007-10-19 7:32 ` Shawn O. Pearce [this message]
2007-10-19 8:05 ` Johannes Sixt
2007-10-19 8:14 ` Shawn O. Pearce
2007-10-19 11:05 ` gitk patch collection pull request Paul Mackerras
2007-10-20 3:10 ` Shawn O. Pearce
2007-10-20 11:12 ` Jonathan del Strother
2007-10-20 11:46 ` Paul Mackerras
2007-10-20 13:00 ` Jonathan del Strother
2007-10-20 15:32 ` Jan Hudec
2007-10-19 13:44 ` [PATCH-resent] gitk: fix in procedure drawcommits Michele Ballabio
2007-10-20 10:16 ` Paul Mackerras
2007-10-20 16:02 ` Michele Ballabio
2007-10-20 18:35 ` Jan Hudec
2007-10-21 3:01 ` Paul Mackerras
2007-10-21 12:12 ` Rocco Rutte
2007-10-19 19:31 ` gitk patch collection pull request Linus Torvalds
2007-10-20 4:45 ` Paul Mackerras
2007-10-20 4:51 ` Linus Torvalds
2007-10-23 0:20 ` Paul Mackerras
2007-10-23 19:17 ` Linus Torvalds
2007-10-23 23:37 ` Paul Mackerras
2007-10-23 23:51 ` Linus Torvalds
2007-10-24 0:17 ` Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071019073253.GM14735@spearce.org \
--to=spearce@spearce$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=j.sixt@viscovery$(echo .)net \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox