Re: [PATCH 01/12] rerere: rename `repo_rerere()`
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 28, 2026, 16:25 UTC
- Message-ID
- <xmqqwlr1bxnn.fsf@gitster.g>
- In-Reply-To
- <auGzRmkt6Mk6peSp@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
Show 9 quoted lines
> I was picking "record" because that's also what git-rerere(1) says: > > This command assists the developer in this process by recording > conflicted automerge results and corresponding hand resolve results on > the initial manual merge, and applying previously recorded hand > resolutions to their corresponding automerge results. > > But I guess your point is valid, as we don't only do that, but also > update merge conflicts locally. I'd pick your "perform" proposal in that
Yup, the description above says "recording" and "applying".
> case and rename it to `rerere_perform()` instead. That name is somewhat > vague, but I guess that cannot be helped because it actually does a > bunch of things at once.
Let's just call it rerere(), then.
It was the original name for the operation before it was renamed in 35843b1123 (rerere.c: remove implicit dependency on the_index, 2018-09-21), which taught it to take an instance of a repository structure.
Going back to that original name is in line with what I said earlier. The "repo_" prefix is a mistaken trend, and once everything becomes free from the_repository, it would become redundant and unnecessary.
Thanks.