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

Amending a merge commit doesn't update the rerere cache

From
Jay Soffian <jaysoffian@gmail.com>
Date
Jun 14, 2010, 23:04 UTC
Message-ID
<AANLkTik50ayTQUnft4oD0Paqf-AuFWxGNdx_zZlHKFPg@mail.gmail.com>
Subject says it all, but I'll elaborate.

During the course of testing a merge, I'll sometimes realize there was a mistake and I'll amend the merge commit. Sadly this doesn't update the rerere cache. For now I've been doing this:

   mv .git/rr-cache .git/rr-cache.saved &&
   git rerere-train HEAD -1 &&
   rsync -av .git/rr-cache/ .git/rr-cache.saved &&
   rm -rf .git/rr-cache &&
   mv .git/rr-cache.saved .git/rr-cache

Which is quite hackish. I think amending a merge commit should probably update the rr-cache, but I'm not sure how best to fix this.

Thoughts?
j.
Next: Michael J Gruber
Message 1 of 9 in “Amending a merge commit doesn't update the rerere cache”
  1. Jay SoffianJun 14, 2010
  2. rerere.txt: Document forget subcommandMichael J Gruber, Jun 15, 2010
  3. Junio C HamanoJun 15, 2010
  4. Jay SoffianJun 15, 2010
  5. Michael J GruberJun 16, 2010
  6. Junio C HamanoJun 16, 2010
  7. [PATCHv2] rerere.txt: Document forget subcommandMichael J Gruber, Jul 5, 2010
  8. Johannes SixtJun 15, 2010
  9. Jay SoffianJun 15, 2010

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.