From 1ae85ff6d418238b8d987c9e019bd785e3ae7192 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 13 Aug 2024 11:06:30 +0200 Subject: [PATCH] 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 Signed-off-by: Johannes Sixt --- lib/commit.tcl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/commit.tcl b/lib/commit.tcl index 11379f8ad3..f00a634624 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -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. -- 2.39.5