Merge branch 'ob/strip-comments-on-commit'
* ob/strip-comments-on-commit: git-gui: do not end the commit message with an empty line
This commit is contained in:
@@ -214,12 +214,10 @@ You must stage at least 1 file before you can commit.
|
||||
global comment_string
|
||||
set cmt_rx [strcat {(^|\n)} [regsub -all {\W} $comment_string {\\&}] {[^\n]*}]
|
||||
regsub -all $cmt_rx $msg {\1} msg
|
||||
# Strip leading empty lines
|
||||
regsub {^\n*} $msg {} msg
|
||||
# Strip leading and trailing empty lines (puts adds one \n)
|
||||
set msg [string trim $msg \n]
|
||||
# Compress consecutive empty lines
|
||||
regsub -all {\n{3,}} $msg "\n\n" msg
|
||||
# Strip trailing empty line
|
||||
regsub {\n\n$} $msg "\n" msg
|
||||
if {$msg eq {}} {
|
||||
error_popup [mc "Please supply a commit message.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user