summaryrefslogtreecommitdiff
path: root/git-gui/lib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-04 20:38:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-04 20:38:50 (GMT)
commit85c787f1e9476c3b8cbeeb4656973d0f1efd9881 (patch)
treeda9739938af80bd6f236db9aa0a95709d22f374f /git-gui/lib
parentf01623b2c9d14207e497b21ebc6b3ec4afaf4b46 (diff)
parentdf4f9e28f64ea97032ec70d9c8894dc87a1b7f9e (diff)
downloadgit-85c787f1e9476c3b8cbeeb4656973d0f1efd9881.zip
git-85c787f1e9476c3b8cbeeb4656973d0f1efd9881.tar.gz
git-85c787f1e9476c3b8cbeeb4656973d0f1efd9881.tar.bz2
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui: Revert "git-gui: remove lines starting with the comment character"
Diffstat (limited to 'git-gui/lib')
-rw-r--r--git-gui/lib/commit.tcl18
1 files changed, 2 insertions, 16 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 23d67d4..11379f8 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/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.