[Geoserver-devel] macOS users important gitconfig changes

GeoServer GeoServer Developer
1

macOS users with an existing checkout, please check for updated Git Client Configuration
Linux and Windows users are unaffected.

Setting for macOS users (assuming case insensitive filesystem):

$ git config --global --get-regexp core.*

core.autocrlf input
core.safecrlf true
core.ignorecase false
core.precomposeunicode true

The above changes in bold allow macOS to match the behaviour of Linux.

Any macOS developers having difficulty updating their checkout:

error: The following untracked working tree files would be overwritten by merge:

data/citensg-1.0/workspaces/sf/sf/EntitéGénérique/featuretype.xml

data/citensg-1.0/workspaces/sf/sf/EntitéGénérique/layer.xml

data/citewfs-1.1/workspaces/sf/sf/EntitéGénérique/featuretype.xml

data/citewfs-1.1/workspaces/sf/sf/EntitéGénérique/layer.xml

data/citewfs-1.1/workspaces/sf/sf/EntitéGénérique/schema.xsd

data/citewfs-2.0/workspaces/sf/sf/EntitéGénérique/featuretype.xml

data/citewfs-2.0/workspaces/sf/sf/EntitéGénérique/layer.xml

Please move or remove them before you merge.

Can be fixed using:

git fetch upstream master

git reset --hard upstream/master

Thanks Michel and Torben for help testing.

···

–
Jody Garnett

2

I would like to back port this change to prior branches (and we should take care not to introduce these kind of differences in the future).

···

–
Jody Garnett

3

I have a PR for the 2.15.x branch here that fixes these folders: [backport 2.15.x] re-add select folders with precomposeunicode=true
(Master and 2.16.x were already fixed)

···

–
Jody Garnett