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

Re: [PATCH v2 2/3] blame: add the ability to ignore commits and their changes

From
BRBarret Rhoden <brho@google.com>
Date
Jan 22, 2019, 15:26 UTC
Message-ID
<20190122102601.24426c8e@brho.roam.corp.google.com>
In-Reply-To
<f5170cb1-4109-4ae3-7722-8e3b62fb0b92@web.de>
On 2019-01-20 at 19:19 René Scharfe <l.s.r@web.de> wrote:
Show 17 quoted lines
> Am 17.01.2019 um 21:29 schrieb Barret Rhoden:
> > The blame_entry will get passed up the tree until we find a commit that
> > has a diff chunk that affects those lines.  If an ignored commit added
> > more lines than it removed, the blame will fall on a commit that made a
> > change nearby.  There is no general solution here, just a best-effort
> > approach.  For a trivial example, consider ignoring this commit:
> >
> > Z: "Adding Lines"
> >  foo
> > +No commit
> > +ever touched
> > +these lines
> >  bar  
> 
> Wouldn't it make more sense to assign such lines to unknown, perhaps
> represented by an all-zero commit ID, instead of blaming a semi-random
> bystander?

I don't know if we can algorithmicly determine whether or not an assignment was the commit the user wanted. Maybe we could add a set of heuristics, like "any diff hunk that only added", as in my example. Maybe if count_a == 0 in blame_chunk_cb, that would work for that case; I'm not too familiar with that code.

Either way, in my next commit I provide the option to mark the commit
with a '*', which could serve the same purpose as the all-zero commit
ID: flag the commit so the user knows it might not be correct.
Barret
Previous: René ScharfeNext: Junio C Hamano
Message 21 of 39 in “blame: add the ability to ignore commits”
  1. blame: add the ability to ignore commitsBarret Rhoden, Jan 7, 2019
  2. Junio C HamanoJan 7, 2019
  3. Barret RhodenJan 8, 2019
  4. Junio C HamanoJan 8, 2019
  5. Barret RhodenJan 9, 2019
  6. Junio C HamanoJan 10, 2019
  7. Barret RhodenJan 14, 2019
  8. Junio C HamanoJan 14, 2019
  9. Randall S. BeckerJan 14, 2019
  10. Barret RhodenJan 14, 2019
  11. Junio C HamanoJan 15, 2019
  12. Stefan BellerJan 9, 2019
  13. Ævar Arnfjörð BjarmasonJan 8, 2019
  14. Barret RhodenJan 8, 2019
  15. Barret RhodenJan 8, 2019
  16. 0/3 blame: add the ability to ignore commitsBarret Rhoden, Jan 17, 2019
  17. 2/3 blame: add the ability to ignore commits and their changesBarret Rhoden, Jan 17, 2019
  18. Johannes SchindelinJan 18, 2019
  19. Barret RhodenJan 18, 2019
  20. René ScharfeJan 20, 2019
  21. Barret RhodenJan 22, 2019
  22. Junio C HamanoJan 22, 2019
  23. Barret RhodenJan 22, 2019
  24. Junio C HamanoJan 23, 2019
  25. Barret RhodenFeb 1, 2019
  26. 3/3 blame: add a config option to mark ignored linesBarret Rhoden, Jan 17, 2019
  27. Johannes SchindelinJan 18, 2019
  28. 1/3 Move init_skiplist() outside of fsckBarret Rhoden, Jan 17, 2019
  29. Johannes SchindelinJan 18, 2019
  30. Ævar Arnfjörð BjarmasonJan 18, 2019
  31. Junio C HamanoJan 18, 2019
  32. Johannes SchindelinJan 18, 2019
  33. Jeff KingJan 18, 2019
  34. Ævar Arnfjörð BjarmasonJan 18, 2019
  35. Jeff KingJan 22, 2019
  36. Ævar Arnfjörð BjarmasonJan 22, 2019
  37. Junio C HamanoJan 22, 2019
  38. Jeff KingJan 22, 2019
  39. Ævar Arnfjörð BjarmasonJan 18, 2019

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.