git-gui: strip comments and consecutive empty lines from commit messages
This is also known as "washing". This is consistent with the behavior of interactive git commit, which we should emulate as closely as possible to avoid usability problems. This way commit message templates and prepare hooks can be used properly, and comments from conflicted rebases and merges are cleaned up without having to introduce special handling for them. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:

committed by
Johannes Sixt

parent
2864e85593
commit
1ae85ff6d4
@ -209,6 +209,10 @@ You must stage at least 1 file before you can commit.
|
||||
#
|
||||
set msg [string trim [$ui_comm get 1.0 end]]
|
||||
regsub -all -line {[ \t\r]+$} $msg {} msg
|
||||
# Strip comment lines
|
||||
regsub -all {(^|\n)#[^\n]*} $msg {\1} msg
|
||||
# Compress consecutive empty lines
|
||||
regsub -all {\n{3,}} $msg "\n\n" msg
|
||||
if {$msg eq {}} {
|
||||
error_popup [mc "Please supply a commit message.
|
||||
|
||||
|
Reference in New Issue
Block a user