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

Re: [PATCH v8 0/2] rerere: wait for MERGE_RR.lock, but not in auto maintenance

From
Patrick Steinhardt <ps@pks.im>
Date
Oct 14, 2026, 05:36 UTC
Message-ID
<as8U2Ao_oX5KsI1b@pks.im>
In-Reply-To
<xmqqy0c1zi6j.fsf@gitster.g>
On Tue, Oct 13, 2026 at 09:20:04AM -0700, Junio C Hamano wrote:
Show 32 quoted lines
> Patrick Steinhardt <ps@pks.im> writes:
> 
> > On Tue, Oct 13, 2026 at 12:07:51PM +0000, Thomas Bachem via GitGitGadget wrote:
> >> Changes since v7:
> >> 
> >>  * The rerere.lockTimeout entry no longer says that the command fails when
> >>    the time is up (Junio).
> >> 
> >>  * The lock tests grep for the "Unable to create" message about
> >>    MERGE_RR.lock (Junio).
> >> 
> >>  * The wait for the background unlocker is now in test_when_finished
> >>    (Junio).
> >> 
> >>  * The rebase --abort test aborts its rebase in test_when_finished, so a
> >>    failed check cannot break later tests.
> >> 
> >>  * The test "merge fails once rerere.lockTimeout is up" never waits, so it
> >>    is now called "merge fails on a lock it cannot take".
> >> 
> >>  * In patch 2, rerere_gc() takes RERERE_NOWAIT again instead of its own enum
> >>    rerere_gc_flags (Patrick).
> >> 
> >>  * The comment about waiting in setup_rerere() now says "by default", and as
> >>    in patch 1 it sits directly above the call that takes the lock.
> >> 
> >>  * A comment in t7900 says why the tests with a held lock create rr-cache.
> >
> > I think this is in a good enough state by now. Thanks!
> 
> OK, thanks for writing and reviewing.  Shall we mark the topic ready
> for 'next' now?
Yeah, let's. Thanks!
Patrick
Previous: Junio C HamanoNext: Thomas Bachem
Message 65 of 66 in “rerere: keep a background gc from killing a rebase”
  1. rerere: keep a background gc from killing a rebaseThomas Bachem via GitGitGadget, Sep 2, 2026
  2. Phillip WoodSep 2, 2026
  3. Thomas BachemSep 2, 2026
  4. Phillip WoodSep 3, 2026
  5. Patrick SteinhardtSep 3, 2026
  6. Thomas BachemSep 3, 2026
  7. Patrick SteinhardtSep 3, 2026
  8. Thomas BachemSep 3, 2026
  9. Phillip WoodSep 3, 2026
  10. rerere: keep a background gc from killing a rebaseThomas Bachem via GitGitGadget, Sep 4, 2026
  11. Phillip WoodSep 4, 2026
  12. Thomas BachemSep 4, 2026
  13. Phillip WoodSep 7, 2026
  14. Junio C HamanoSep 4, 2026
  15. Thomas BachemSep 4, 2026
  16. rerere: keep a background gc from killing a rebaseThomas Bachem via GitGitGadget, Sep 4, 2026
  17. Junio C HamanoSep 4, 2026
  18. Thomas BachemSep 5, 2026
  19. Junio C HamanoSep 5, 2026
  20. Thomas BachemSep 6, 2026
  21. Patrick SteinhardtSep 7, 2026
  22. 0/2 rerere: wait for MERGE_RR.lock, and go on at a conflictThomas Bachem via GitGitGadget, Sep 14, 2026
  23. 1/2 rerere: wait for MERGE_RR.lock, and let the gc skip itThomas Bachem via GitGitGadget, Sep 14, 2026
  24. Patrick SteinhardtSep 28, 2026
  25. 2/2 rerere: go on at a conflict when the lock stays busyThomas Bachem via GitGitGadget, Sep 14, 2026
  26. Patrick SteinhardtSep 28, 2026
  27. 0/3 rerere: wait for MERGE_RR.lock, and go on at a conflictThomas Bachem via GitGitGadget, Sep 28, 2026
  28. 1/3 rerere: wait for MERGE_RR.lock before giving upThomas Bachem via GitGitGadget, Sep 28, 2026
  29. 2/3 rerere: add "gc --auto" that skips a held lockThomas Bachem via GitGitGadget, Sep 28, 2026
  30. Patrick SteinhardtSep 30, 2026
  31. Thomas BachemOct 1, 2026
  32. Patrick SteinhardtOct 1, 2026
  33. 3/3 rerere: go on at a conflict when the lock stays busyThomas Bachem via GitGitGadget, Sep 28, 2026
  34. 0/3 rerere: wait for MERGE_RR.lock, and go on at a conflictThomas Bachem via GitGitGadget, Oct 2, 2026
  35. 1/3 rerere: wait for MERGE_RR.lock before giving upThomas Bachem via GitGitGadget, Oct 2, 2026
  36. 2/3 rerere: add "gc --skip-locked" for auto maintenanceThomas Bachem via GitGitGadget, Oct 2, 2026
  37. Patrick SteinhardtOct 9, 2026
  38. Thomas BachemOct 10, 2026
  39. 3/3 rerere: go on at a conflict when the lock stays busyThomas Bachem via GitGitGadget, Oct 2, 2026
  40. Patrick SteinhardtOct 9, 2026
  41. Thomas BachemOct 10, 2026
  42. 0/2 rerere: wait for MERGE_RR.lock, but not in auto maintenanceThomas Bachem via GitGitGadget, Oct 10, 2026
  43. 1/2 rerere: wait for MERGE_RR.lock before giving upThomas Bachem via GitGitGadget, Oct 10, 2026
  44. Junio C HamanoOct 11, 2026
  45. Thomas BachemOct 11, 2026
  46. Junio C HamanoOct 12, 2026
  47. Okhuomon AjayiOct 14, 2026
  48. credential-store: add lockTimeout config optionOkhuomon Ajayi, Oct 14, 2026
  49. Junio C HamanoOct 15, 2026
  50. Okhuomon AjayiOct 16, 2026
  51. credential-store: add lockTimeout config optionOkhuomon Ajayi, Oct 16, 2026
  52. Okhuomon AjayiOct 20, 2026
  53. Okhuomon AjayiNov 12, 2026
  54. Junio C HamanoNov 12, 2026
  55. Okhuomon AjayiNov 15, 2026
  56. credential-store: add lockTimeout config optionOkhuomon Ajayi, Nov 16, 2026
  57. Junio C HamanoNov 16, 2026
  58. 2/2 rerere: add "gc --skip-locked" for auto maintenanceThomas Bachem via GitGitGadget, Oct 10, 2026
  59. Patrick SteinhardtOct 13, 2026
  60. 0/2 rerere: wait for MERGE_RR.lock, but not in auto maintenanceThomas Bachem via GitGitGadget, Oct 13, 2026
  61. 1/2 rerere: wait for MERGE_RR.lock before giving upThomas Bachem via GitGitGadget, Oct 13, 2026
  62. 2/2 rerere: add "gc --skip-locked" for auto maintenanceThomas Bachem via GitGitGadget, Oct 13, 2026
  63. Patrick SteinhardtOct 13, 2026
  64. Junio C HamanoOct 13, 2026
  65. Patrick SteinhardtOct 14, 2026
  66. Thomas BachemOct 14, 2026

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.