From b9a43869c9f96d3577d6f568c1bda1940c8f0e31 Mon Sep 17 00:00:00 2001 From: Pratyush Yadav Date: Wed, 3 Feb 2021 01:28:12 +0530 Subject: git-gui: remove lines starting with the comment character The comment character is specified by the config variable 'core.commentchar'. Any lines starting with this character is considered a comment and should not be included in the final commit message. Teach git-gui to filter out lines in the commit message that start with the comment character using git-stripspace. If the config is not set, '#' is taken as the default. Also add a message educating users about the comment character. Signed-off-by: Pratyush Yadav --- git-gui.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'git-gui.sh') diff --git a/git-gui.sh b/git-gui.sh index 201524c34e..236bc4e61d 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -875,6 +875,7 @@ 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(gui.encoding) [encoding system] set default_config(gui.matchtrackingbranch) false @@ -3436,6 +3437,10 @@ proc trace_commit_type {varname args} { merge {set txt [mc "Merge Commit Message:"]} * {set txt [mc "Commit Message:"]} } + + set comment_char [get_config core.commentchar] + set txt [string cat $txt \ + [mc " (Lines starting with '$comment_char' will be ignored)"]] $ui_coml conf -text $txt } trace add variable commit_type write trace_commit_type -- cgit v1.2.3