diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-04 23:38:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-04 23:38:50 +0300 |
| commit | 85c787f1e9476c3b8cbeeb4656973d0f1efd9881 (patch) | |
| tree | da9739938af80bd6f236db9aa0a95709d22f374f /git-gui | |
| parent | f01623b2c9d14207e497b21ebc6b3ec4afaf4b46 (diff) | |
| parent | df4f9e28f64ea97032ec70d9c8894dc87a1b7f9e (diff) | |
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')
| -rwxr-xr-x | git-gui/git-gui.sh | 5 | ||||
| -rw-r--r-- | git-gui/lib/commit.tcl | 18 |
2 files changed, 2 insertions, 21 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 236bc4e61d..201524c34e 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -875,7 +875,6 @@ set default_config(merge.summary) false set default_config(merge.verbosity) 2 set default_config(user.name) {} set default_config(user.email) {} -set default_config(core.commentchar) "#" set default_config(gui.encoding) [encoding system] set default_config(gui.matchtrackingbranch) false @@ -3437,10 +3436,6 @@ proc trace_commit_type {varname args} { merge {set txt [mc "Merge Commit Message:"]} * {set txt [mc "Commit Message:"]} } - - set comment_char [get_config core.commentchar] - set txt [string cat $txt \ - [mc " (Lines starting with '$comment_char' will be ignored)"]] $ui_coml conf -text $txt } trace add variable commit_type write trace_commit_type diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 23d67d4651..11379f8ad3 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. |