global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-28 03:22:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #665 from yaras/fix-git-664

Browse Source 
Fix initial git gui message encoding
This commit is contained in:
Johannes Schindelin
2016-07-12 06:33:35 +02:00
parent 902f3004e8 9646fd1636
commit 40e1286881
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-gui/git-gui.sh
View File

@@ -1599,11 +1599,13 @@ proc run_prepare_commit_msg_hook {} {
if {[file isfile [gitdir MERGE_MSG]]} {
set pcm_source "merge"
set fd_mm [open [gitdir MERGE_MSG] r]
fconfigure $fd_mm -encoding utf-8
puts -nonewline $fd_pcm [read $fd_mm]
close $fd_mm
} elseif {[file isfile [gitdir SQUASH_MSG]]} {
set pcm_source "squash"
set fd_sm [open [gitdir SQUASH_MSG] r]
fconfigure $fd_sm -encoding utf-8
puts -nonewline $fd_pcm [read $fd_sm]
close $fd_sm
} else {