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

Fix initial git gui message encoding
git-for-windows · Oct 4, 2016 · 6feadb6 · 6feadb6
2 parents c4d4de4 + 9826273
commit 6feadb6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
@@ -1601,11 +1601,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 {