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

Re: What's the recommendation for forgetting all rerere's records?

From
Sean Allred <allred.sean@gmail.com>
Date
Dec 15, 2023, 12:21 UTC
Message-ID
<m0sf43abw7.fsf@epic96565.epic.com>
In-Reply-To
<xmqqcyvgz3ih.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 6 quoted lines
> Sean Allred <allred.sean@gmail.com> writes:
>> When outside the context of a conflict (no rebase/merge in progress),
>> what's the intended workflow to clear out the contents of
>> $GIT_DIR/rr-cache?
>
> You could "rm -fr .git/rr-cache/??*" if you want.
Here's my reasoning for not wanting that:
>> I'm wary of recommending `rm -rf "$(git rev-parse --git-dir)/rr-cache"`
>> -- it's hard to describe this as anything but hacky when the rest of the
>> experience is handled in porcelain.
> The "intended" workflow is there will no need to "clear out" at all;
> you may notice mistaken resolution, and you will remove it when you
> notice one, but the bulk of the remaining database entries ought to
> be still correct.

When we noticed mistaken resolutions, rerere had already applied the recorded resolution and there was no apparent way to return to the conflicted state. If clearing out the rerere database was never an intended workflow here, maybe _that's_ my actual question?

It seems likely this 'recovery' workflow should just be documented in git-rerere.txt (which I'm happy to take on once I learn what that workflow should be).

-- Sean Allred

Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 7 in “What's the recommendation for forgetting all rerere's records?”
  1. Sean AllredDec 6, 2023
  2. Junio C HamanoDec 8, 2023
  3. Sean AllredDec 15, 2023
  4. Junio C HamanoDec 15, 2023
  5. Sean AllredJan 3, 2024
  6. Sean AllredJan 3, 2024
  7. Sean AllredFeb 10, 2024

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.