From: Junio C Hamano Date: Tue, 27 Oct 2026 19:48:36 GMT Subject: Re: [PATCH 01/12] rerere: rename `repo_rerere()` Message-ID: In-Reply-To: <20261027-pks-rerere-subcommands-v1-1-d836c36ce0c5@pks.im> Patrick Steinhardt writes: > The `repo_rerere()` function is the only function in "rerere.h" that > does not have a `rerere_` prefix. And while it does indeed receive a > repository as first parameter, that's not a good-enough reason to give > it a `repo_` prefix. > > Rename the function to `rerere_record()` to be consistent with all the > other functions. I do not think the convention to give "repo_" prefix to variants of functions that worked only on the_repository should stay with us forever, and losing repo prefix from this function would be an excellent first move towards that future. I howevr take isseus with the verb "record" in its new name. What the function does is not just record. It autonomously finds out what situation it is in and does the logical next thing, which varies. It resolves when a recorded resolution exist. it records when seeing a particular conflict for the first time. There was no single good verb to express that. Perhaps "to rerere" or "to perform rerere" can be invented as a verb to describe such an intelligent operation?