git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH resend again] gitk: Do not pick up file names of "copy from" lines

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Oct 19, 2007, 07:25 UTC
Message-ID
<47185BCC.9010307@viscovery.net>
In-Reply-To
<20071019052823.GI14735@spearce.org>
From: Johannes Sixt <johannes.sixt@telecom.at>

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>
---
  Shawn O. Pearce schrieb:
  > I'm carrying these in my pu branch but would like to move them up
  > into master.
  Would you mind putting this one into your queue, too? I haven't seen it
  appear in Paul's repo.
  -- Hannes
  gitk |    3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)
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]
-- 
1.5.3.722.gccbb1
Previous: Shawn O. PearceNext: Shawn O. Pearce
Message 2 of 25 in “gitk patch collection pull request”
  1. Shawn O. PearceOct 19, 2007
  2. gitk: Do not pick up file names of "copy from" linesJohannes Sixt, Oct 19, 2007
  3. Shawn O. PearceOct 19, 2007
  4. Johannes SixtOct 19, 2007
  5. Shawn O. PearceOct 19, 2007
  6. Paul MackerrasOct 19, 2007
  7. Shawn O. PearceOct 20, 2007
  8. Jonathan del StrotherOct 20, 2007
  9. Paul MackerrasOct 20, 2007
  10. Jonathan del StrotherOct 20, 2007
  11. Jan HudecOct 20, 2007
  12. gitk: fix in procedure drawcommitsMichele Ballabio, Oct 19, 2007
  13. Paul MackerrasOct 20, 2007
  14. Michele BallabioOct 20, 2007
  15. Jan HudecOct 20, 2007
  16. Paul MackerrasOct 21, 2007
  17. Rocco RutteOct 21, 2007
  18. Linus TorvaldsOct 19, 2007
  19. Paul MackerrasOct 20, 2007
  20. Linus TorvaldsOct 20, 2007
  21. Paul MackerrasOct 23, 2007
  22. Linus TorvaldsOct 23, 2007
  23. Paul MackerrasOct 23, 2007
  24. Linus TorvaldsOct 23, 2007
  25. Paul MackerrasOct 24, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.