From 6b43a57dfce1e5acd85f7a8365c080b6fc4f8645 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 15 Mar 2025 15:09:13 +0100 Subject: git-gui: heed core.commentChar/commentString This amends 1ae85ff6d (git-gui: strip comments and consecutive empty lines from commit messages, 2024-08-13) to deal with custom comment characters/strings. The magic commentString value "auto" is not handled, because the option makes no sense to me - it does not support comments in templates and hook output, and it seems far-fetched that someone would introduce comments during editing the message. Signed-off-by: Oswald Buddenhagen Signed-off-by: Johannes Sixt --- git-gui.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'git-gui.sh') diff --git a/git-gui.sh b/git-gui.sh index 8fe7538e72..2bc2c9b63e 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -880,6 +880,12 @@ proc apply_config {} { color::sync_with_theme } } + + global comment_string + set comment_string [get_config core.commentstring] + if {$comment_string eq {}} { + set comment_string [get_config core.commentchar] + } } set default_config(branch.autosetupmerge) true @@ -890,6 +896,8 @@ set default_config(merge.summary) false set default_config(merge.verbosity) 2 set default_config(user.name) {} set default_config(user.email) {} +set default_config(core.commentchar) "#" +set default_config(core.commentstring) {} set default_config(gui.encoding) [encoding system] set default_config(gui.matchtrackingbranch) false -- cgit v1.3