diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2025-04-20 09:27:22 +0200 |
|---|---|---|
| committer | Johannes Sixt <j6t@kdbg.org> | 2025-04-20 09:27:22 +0200 |
| commit | 2a7d4f2f078a8a10f866c723765c2f1c4f76d448 (patch) | |
| tree | 10d54bc374227789528a2279054b8b12c39a7724 | |
| parent | ae6336b6173bf5303fad53e0a52a16f92c47b6b7 (diff) | |
| parent | 6b43a57dfce1e5acd85f7a8365c080b6fc4f8645 (diff) | |
| download | git-2a7d4f2f078a8a10f866c723765c2f1c4f76d448.tar.gz | |
Merge branch 'ob/strip-comments-on-commit'
* ob/strip-comments-on-commit:
git-gui: heed core.commentChar/commentString
| -rwxr-xr-x | git-gui.sh | 8 | ||||
| -rw-r--r-- | lib/commit.tcl | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh index 887d6d596c..28572c889c 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -880,6 +880,12 @@ proc apply_config {} { color::sync_with_theme } } + + global comment_string + set comment_string [get_config core.commentstring] + if {$comment_string eq {}} { + set comment_string [get_config core.commentchar] + } } set default_config(branch.autosetupmerge) true @@ -890,6 +896,8 @@ set default_config(merge.summary) false set default_config(merge.verbosity) 2 set default_config(user.name) {} set default_config(user.email) {} +set default_config(core.commentchar) "#" +set default_config(core.commentstring) {} set default_config(gui.encoding) [encoding system] set default_config(gui.matchtrackingbranch) false diff --git a/lib/commit.tcl b/lib/commit.tcl index 208dc2817c..a570f9cdc6 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -211,7 +211,9 @@ You must stage at least 1 file before you can commit. # Strip trailing whitespace regsub -all -line {[ \t\r]+$} $msg {} msg # Strip comment lines - regsub -all {(^|\n)#[^\n]*} $msg {\1} msg + 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 # Compress consecutive empty lines |