@matheusbsbs / matheus-bagliano / commits / 4e55d19a13
Fork 0

git-gui: Cleanup end-of-line whitespace in commit messages.

When committing changes its useless to have trailing whitespace on the end of a line within the commit message itself; this serves no purpose beyond wasting space in the repository. But it happens a lot on my Mac OS X system if I copy text out of a Terminal.app window and paste it into git-gui. We now clip any trailing whitespace from the commit buffer when loading it from a file, when saving it out to our backup file, or when making the actual commit object. I also fixed a bug where we lost the commit message buffer if you quit without editing the text region. This can happen if you quit and restart git-gui frequently in the middle of an editing session. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Jan 25, 2007 at 12:54 UTC 4e55d19a1377de55c950a90c10b31ae37b79363d
1 file changed +6 -3
git-gui.sh
+6 -3
@@ -428,6 +428,7 @@ proc load_message {file} {
428 }
429 set content [string trim [read $fd]]
430 close $fd
431 + regsub -all -line {[ \r\t]+$} $content {} content
432 $ui_comm delete 0.0 end
433 $ui_comm insert end $content
434 return 1
@@ -1046,6 +1047,7 @@ You must add at least 1 file before you can commit.
1047 # -- A message is required.
1048 #
1049 set msg [string trim [$ui_comm get 1.0 end]]
1050 + regsub -all -line {[ \t\r]+$} $msg {} msg
1051 if {$msg eq {}} {
1052 error_popup {Please supply a commit message.
1053
@@ -2984,12 +2986,13 @@ proc do_quit {} {
2986 #
2987 set save [gitdir GITGUI_MSG]
2988 set msg [string trim [$ui_comm get 0.0 end]]
2987 - if {![string match amend* $commit_type]
2988 - && [$ui_comm edit modified]
2989 + regsub -all -line {[ \r\t]+$} $msg {} msg
2990 + if {(![string match amend* $commit_type]
2991 + || [$ui_comm edit modified])
2992 && $msg ne {}} {
2993 catch {
2994 set fd [open $save w]
2992 - puts $fd [string trim [$ui_comm get 0.0 end]]
2995 + puts -nonewline $fd $msg
2996 close $fd
2997 }
2998 } else {