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

gitk "find commit adding/removing string"/possible pickaxe bug?

From
SHSebastian Hahn <mail@sebastianhahn.net>
Date
Jan 18, 2011, 16:16 UTC
Message-ID
<514EB3AA-CD31-4BDB-B777-B7AAEEDF5663@sebastianhahn.net>
Hi,

I quite like gitk and am a fan of the ability to easily locate commits where a specific string was added/removed. If the string in question was added in a merge commit as part of a conflicted/otherwise changed merge, gitk doesn't display it.

(If you want to reproduce, the repository is git://git.torproject.org/ tor, the string I'm looking for is "< DIGEST" and the first commit I hope to find is ed87738ede789fb).

I presented the issue to #git, and it was suggested that it is probably a pickaxe bug in that it doesn't display changes in merge commits if they add strings that neither of their parents has.

Do you agree that this is a bug, or am I missing anything here?
Thanks for you consideration!
Sebastian
Next: Thomas Rast
Message 1 of 10 in “gitk "find commit adding/removing string"/possible pickaxe bug?”
  1. Sebastian HahnJan 18, 2011
  2. Thomas RastJan 18, 2011
  3. Junio C HamanoJan 18, 2011
  4. Jeff KingJan 18, 2011
  5. Thomas RastJan 18, 2011
  6. Jeff KingJan 18, 2011
  7. Junio C HamanoJan 18, 2011
  8. Jeff KingJan 18, 2011
  9. Jeff KingJan 31, 2011
  10. Thomas RastJan 18, 2011

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.