diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-11-11 12:47:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-11-11 12:47:44 +0900 |
| commit | b31fb630c0fc6869a33ed717163e8a1210460d94 (patch) | |
| tree | f5dec9d70d06e8b5095ed20c66cea490ef095795 /git-gui/lib/commit.tcl | |
| parent | The eighth batch (diff) | |
| parent | Merge branch 'ob/strip-comments-on-commit' (diff) | |
| download | git-b31fb630c0fc6869a33ed717163e8a1210460d94.tar.gz git-b31fb630c0fc6869a33ed717163e8a1210460d94.zip | |
Merge https://github.com/j6t/git-gui
* https://github.com/j6t/git-gui:
git gui: add directly calling merge tool from configuration
git-gui: strip commit messages less aggressively
git-gui: strip comments and consecutive empty lines from commit messages
Diffstat (limited to 'git-gui/lib/commit.tcl')
| -rw-r--r-- | git-gui/lib/commit.tcl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 11379f8ad3..208dc2817c 100644 --- a/git-gui/lib/commit.tcl +++ b/git-gui/lib/commit.tcl @@ -207,8 +207,17 @@ 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]] + set msg [$ui_comm get 1.0 end] + # Strip trailing whitespace regsub -all -line {[ \t\r]+$} $msg {} msg + # Strip comment lines + regsub -all {(^|\n)#[^\n]*} $msg {\1} msg + # Strip leading empty lines + regsub {^\n*} $msg {} msg + # 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. |