diff options
| author | Pratyush Yadav <me@yadavpratyush.com> | 2021-02-03 01:28:12 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2021-02-18 23:35:57 +0530 |
| commit | b9a43869c9f96d3577d6f568c1bda1940c8f0e31 (patch) | |
| tree | 980c9403b749b7f9c5d8b99d271c94c695ffc540 /lib/commit.tcl | |
| parent | 7da7ef6d7a2139699e2d25d7f4e679327bffa107 (diff) | |
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 <me@yadavpratyush.com>
Diffstat (limited to 'lib/commit.tcl')
| -rw-r--r-- | lib/commit.tcl | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl index 11379f8ad3..23d67d4651 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -141,6 +141,20 @@ proc setup_commit_encoding {msg_wt {quiet 0}} { } } +proc strip_msg {msg} { + set cmd [concat [list | ] [_git_cmd stripspace] --strip-comments] + _trace_exec $cmd + set fd [open $cmd r+] + fconfigure $fd -translation binary -encoding utf-8 + + puts -nonewline $fd $msg + close $fd w + set result [read $fd] + close $fd + + return $result +} + proc commit_tree {} { global HEAD commit_type file_states ui_comm repo_config global pch_error @@ -207,8 +221,8 @@ You must stage at least 1 file before you can commit. # -- A message is required. # - set msg [string trim [$ui_comm get 1.0 end]] - regsub -all -line {[ \t\r]+$} $msg {} msg + set msg [strip_msg [$ui_comm get 1.0 end]] + if {$msg eq {}} { error_popup [mc "Please supply a commit message. |