git-gui: Convert merge dialog to use class system

diff --git a/lib/commit.tcl b/lib/commit.tcl
index 3172d7cb60b87cfb5d681d511fe9c5442749793c..0f3b16dfeb05e4451df3204e94106c0c7b53cbc4 100644 (file)
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -209,7 +209,7 @@ A good commit message has the following format:
        ui_status {Calling pre-commit hook...}
        set pch_error {}
        set fd_ph [open "| $pchook" r]
-       fconfigure $fd_ph -blocking 0 -translation binary
+       fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
        fileevent $fd_ph readable \
                [list commit_prehook_wait $fd_ph $curHEAD $msg]
 }
@@ -258,7 +258,7 @@ proc commit_committree {fd_wt curHEAD msg} {
        # -- Verify this wasn't an empty change.
        #
        if {$commit_type eq {normal}} {
-               set fd_ot [open "| git cat-file commit $PARENT" r]
+               set fd_ot [git_read cat-file commit $PARENT]
                fconfigure $fd_ot -encoding binary -translation lf
                set old_tree [gets $fd_ot]
                close $fd_ot