From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> Thanks to Ayush, Junio and Oswald for their comments on V1. This series implements the plan to deprecate and remove support for core.commentChar=auto outlined in [1]. This feature has been the source of a couple of bug reports recently [2,3] and it is hard to see how the design can be fixed as it is incompatible with preparing a commit message template containing comments. When git sees the deprecated config setting it will print advice based on the user's config setting to help the user either remove the setting or set a custom comment string. In the example below core.commentString is set multiple times in $XDG_CONFIG_HOME/git/config and core.commentChar is set in ~/.gitconfig and $XDG_CONFIG_HOME/git/config. warning: Support for 'core.commentChar=auto' is deprecated and will be removed in Git 3.0 hint: hint: To use the default comment string (#) please run hint: hint: git config unset --file ~/.config/git/config --all core.commentString hint: git config unset --file ~/.config/git/config core.commentChar hint: git config unset --global core.commentChar hint: hint: To set a custom comment string please run hint: hint: git config set --global core.commentChar <comment string> hint: hint: where '<comment string>' is the string you wish to use. [1] https://lore.kernel.org/git/6a3154e0-e7bc-45ae-b554-67ccab18727a@xxxxxxxxx [2] https://lore.kernel.org/git/20250315140913.577404-1-oswald.buddenhagen@xxxxxx [3] https://lore.kernel.org/git/20250626132233.414789-1-ayu.chandekar@xxxxxxxxx Changes since V1: - Rebased onto a merge of 'ps/config-wo-the-repository' and 'master' - Reworded commit messages - What was patch 2 has been split into two separate patches and reworked to die when core.commentChar=auto and WITH_BREAKING_CHANGES is enabled. Base-Commit: 1ae5bd276bdf101e37c1a8f2904a2eae05fbb744 Published-As: https://github.com/phillipwood/git/releases/tag/pw%2Fremove-auto-comment-char%2Fv2 View-Changes-At: https://github.com/phillipwood/git/compare/1ae5bd276...0e7c08b15 Fetch-It-Via: git fetch https://github.com/phillipwood/git pw/remove-auto-comment-char/v2 Phillip Wood (3): breaking-changes: deprecate support for core.commentString=auto config: warn on core.commentString=auto commit: print advice when core.commentString=auto Documentation/BreakingChanges.adoc | 5 + Documentation/config/core.adoc | 20 +- builtin/commit.c | 7 + builtin/merge.c | 3 + builtin/rebase.c | 3 + builtin/revert.c | 7 + config.c | 297 ++++++++++++++++++++++++++++- environment.c | 11 +- environment.h | 3 + repository.c | 1 + repository.h | 3 + t/t3404-rebase-interactive.sh | 19 +- t/t3418-rebase-continue.sh | 2 +- t/t7502-commit-porcelain.sh | 52 ++++- 14 files changed, 421 insertions(+), 12 deletions(-) Range-diff against v1: 1: 3747a1f77f0 < -: ----------- breaking-changes: deprecate support for core.commentString=auto 2: 83d0d3ece86 < -: ----------- commit: print advice when core.commentString=auto -: ----------- > 1: a6355451d4b breaking-changes: deprecate support for core.commentString=auto -: ----------- > 2: 8b575980426 config: warn on core.commentString=auto -: ----------- > 3: 0e7c08b15e5 commit: print advice when core.commentString=auto -- 2.49.0.897.gfad3eb7d210
