From c0698df0579a14270e491b2f1ffdfc39d3b86310 Mon Sep 17 00:00:00 2001 From: Pratyush Yadav Date: Thu, 4 Mar 2021 13:53:27 +0530 Subject: Revert "git-gui: remove lines starting with the comment character" This reverts commit b9a43869c9f96d3577d6f568c1bda1940c8f0e31. This commit causes breakage on macOS (10.13). It causes errors on startup and completely breaks the commit functionality. There are two main problems. First, it uses `string cat` which is not supported on older Tcl versions. Second, it does a half close of the bidirectional pipe to git-stripspace which is also not supported on older Tcl versions. Reported-by: Eric Sunshine Signed-off-by: Pratyush Yadav --- lib/commit.tcl | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'lib/commit.tcl') diff --git a/lib/commit.tcl b/lib/commit.tcl index 23d67d4651..11379f8ad3 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -141,20 +141,6 @@ proc setup_commit_encoding {msg_wt {quiet 0}} { } } -proc strip_msg {msg} { - set cmd [concat [list | ] [_git_cmd stripspace] --strip-comments] - _trace_exec $cmd - set fd [open $cmd r+] - fconfigure $fd -translation binary -encoding utf-8 - - puts -nonewline $fd $msg - close $fd w - set result [read $fd] - close $fd - - return $result -} - proc commit_tree {} { global HEAD commit_type file_states ui_comm repo_config global pch_error @@ -221,8 +207,8 @@ You must stage at least 1 file before you can commit. # -- A message is required. # - set msg [strip_msg [$ui_comm get 1.0 end]] - + set msg [string trim [$ui_comm get 1.0 end]] + regsub -all -line {[ \t\r]+$} $msg {} msg if {$msg eq {}} { error_popup [mc "Please supply a commit message. -- cgit v1.2.3