Re: [PATCH] merge-recursive: use fspathcmp() in path_hashmap_cmp()
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 13, 2021, 11:37 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2109131335260.55@tvgsbejvaqbjf.bet>
- In-Reply-To
- <8bd13e99-208b-4c22-90e6-28227593e9c4@web.de>
Hi René,
On Sat, 11 Sep 2021, René Scharfe wrote:
Show 27 quoted lines
> Am 30.08.21 um 22:49 schrieb Jeff King: > > On Mon, Aug 30, 2021 at 08:22:25PM +0200, René Scharfe wrote: > > > >>> It however may not be a bad idea to catch these code paths where a > >>> local variable masks 'ignore_case' (and possibly other globals) and > >>> rename these local ones to avoid a mistake like this. > >> > >> The name itself is OK, I think, but using it at global scope is > >> confusing. -Wshadow can help find such cases, but not this one, as > >> test-hashmap.c doesn't include the global declaration. Moving the > >> global into a struct to provide a poor man's namespace would fix this > >> for all namesakes, assisted by the compiler. We'd then access it as > >> the_config.ignore_case or even the_config.core.ignore_case. > >> > >> Moving all config-related variables would be quite noisy, I guess, > >> and probably conflict with lots of in-flight patches, but might be > >> worth it. > > > > Really most of these ought to be in the repository struct anyway, I > > would think. The value of ignore_case comes from core.ignorecase, which > > is going to be repository-specific. We are probably doing the wrong > > thing already by looking at the parent core.ignorecase value when > > operating in an in-process submodule, but nobody noticed because it's > > quite unlikely for a submodule to have a different setting than the > > parent. > > Good point. So fspathcmp() and friends would need a repo parameter. :-|
Yes, we will eventually have to pass `struct repository *r` into a _lot_ of call chains. It'll be a disruptive change, yet if the submodule folks truly want to aim for in-process recursive treatment of submodules, there is no alternative.
FWIW on Windows there are other potentially repository-specific settings that are relevant in similar situations. For example, there is `core.symlinks`.
Ciao, Dscho