summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-10-02 14:16:54 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-20 03:09:27 (GMT)
commit5e85ec4cd0658232fa8ee13e8cd9da21e0e4973e (patch)
treeae2740d862f66e0c6333036e178d8e3f1997fdcf /gitk
parent5dd57d512225bb82aa0010b39aaec0085d471eac (diff)
downloadgit-5e85ec4cd0658232fa8ee13e8cd9da21e0e4973e.zip
git-5e85ec4cd0658232fa8ee13e8cd9da21e0e4973e.tar.gz
git-5e85ec4cd0658232fa8ee13e8cd9da21e0e4973e.tar.bz2
gitk: Do not pick up file names of "copy from" lines
A file copy would be detected only if the original file was modified in the same commit. This implies that there will be a patch listed under the original file name, and we would expect that clicking the original file name in the file list warps the patch window to that file's patch. (If the original file was not modified, the copy would not be detected in the first place, the copied file would be listed as "new file", and this whole matter would not apply.) However, if the name of the copy is sorted after the original file's patch, then the logic introduced by commit d1cb298b0b (which picks up the link information from the "copy from" line) would overwrite the link information that is already present for the original file name, which was parsed earlier. Hence, this patch reverts part of said commit. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk3
1 files changed, 1 insertions, 2 deletions
diff --git a/gitk b/gitk
index 46673e3..516e14a 100755
--- a/gitk
+++ b/gitk
@@ -5221,8 +5221,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]