On Wed, Sep 5, 2018 at 11:04 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > now and here, but at some later date, we would want to > > 'git revert 24/24' after fixing all in-flights of today. > > No. We do not want to revert the whole thing. > > If the function that takes a_repository is called repo_rerere(), as > opposed to just rerere(), it should keep that name after we > deprecate the function rerere(). > > We will want to get rid of #define that gives a thin wrapper and > make everybody use the API that requires a_repository parameter. > > And from that point of view, it is backwards not to introduce > repo_rerere() when rerere.c gains a variant that can work in an > arbitrary repository, not limited to the_repository, and fix it up > saying "oops, we were wrong and this will break topics in flight" at > the very end. In the end, there's no variant, only one function that always takes 'struct repository *' and I wanted to keep the shorter name 'rerere'. But let's go with adding repo_rerere() and deprecating rerere(). If it turns out later that repo_rerere is too long (or it's repo_xyz everywhere) then we can do another rename. -- Duy
