diff options
| author | Pratyush Yadav <me@yadavpratyush.com> | 2021-03-04 13:59:45 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2021-03-04 13:59:45 +0530 |
| commit | df4f9e28f64ea97032ec70d9c8894dc87a1b7f9e (patch) | |
| tree | e2b2168c6221cb66258582b0b7a3db73aef8fe57 /lib/commit.tcl | |
| parent | b1056f60b63f1bc8226d01881bc829e171fc78bf (diff) | |
| parent | c0698df0579a14270e491b2f1ffdfc39d3b86310 (diff) | |
Merge branch 'py/revert-commit-comments'
This commit causes breakage on macOS, or in fact any platform using
older versions of Tcl. Revert it.
* py/revert-commit-comments:
Revert "git-gui: remove lines starting with the comment character"
Diffstat (limited to 'lib/commit.tcl')
| -rw-r--r-- | lib/commit.tcl | 18 |
1 files changed, 2 insertions, 16 deletions
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. |