mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://github.com/prati0100/git-gui

Browse Source 
* https://github.com/prati0100/git-gui:
  Revert "git-gui: remove lines starting with the comment character"
This commit is contained in:
Junio C Hamano
2021-03-04 12:38:50 -08:00
parent f01623b2c9 df4f9e28f6
commit 85c787f1e9
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
git-gui/lib/commit.tcl
View File

@ -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.