git-gui: do not end the commit message with an empty line
The commit message is processed to remove unnecessary empty lines. In particular, it is ensured that the text ends with at most one LF character. This one is always present, because the Tk text widget ensures that is present. However, did not consider that the processed text is written to the commit message file using `puts`, which also appends a LF character, so that the final commit message ends with two LF. Trim all trailing LF characters, and while we are here, use `string trim`, which lets us remove the leading LF in the same command. Reported-by: Gareth Fenn <garethfenn@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Johannes Sixt committed
May 14, 2025 at 22:41 UTC
80983c4131e2f35f6363d4d3580c39d6306236a4
1 file changed
+2
-4
lib/commit.tcl
+2
-4
@@ -214,12 +214,10 @@ You must stage at least 1 file before you can commit.
214
global comment_string
215
set cmt_rx [strcat {(^|\n)} [regsub -all {\W} $comment_string {\\&}] {[^\n]*}]
216
regsub -all $cmt_rx $msg {\1} msg
217
- # Strip leading empty lines
218
- regsub {^\n*} $msg {} msg
217
+ # Strip leading and trailing empty lines (puts adds one \n)
218
+ set msg [string trim $msg \n]
219
# Compress consecutive empty lines
220
regsub -all {\n{3,}} $msg "\n\n" msg
221
- # Strip trailing empty line
222
- regsub {\n\n$} $msg "\n" msg
221
if {$msg eq {}} {
222
error_popup [mc "Please supply a commit message.
223