diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/blame.tcl | 1 | ||||
| -rw-r--r-- | lib/index.tcl | 3 | ||||
| -rw-r--r-- | lib/mergetool.tcl | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/lib/blame.tcl b/lib/blame.tcl index 63a59fdbb3..e51a820b12 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -1142,7 +1142,6 @@ method _blameparent {} { fconfigure $fd \ -blocking 0 \ - -encoding binary \ -translation binary fileevent $fd readable [cb _read_diff_load_commit \ $fd $cparent $new_path $r_orig_line] diff --git a/lib/index.tcl b/lib/index.tcl index 377547034b..7aa09c7728 100644 --- a/lib/index.tcl +++ b/lib/index.tcl @@ -78,7 +78,6 @@ proc update_indexinfo {msg path_list after} { -blocking 0 \ -buffering full \ -buffersize 512 \ - -encoding binary \ -translation binary fileevent $fd writable [list \ write_update_indexinfo \ @@ -147,7 +146,6 @@ proc update_index {msg path_list after} { -blocking 0 \ -buffering full \ -buffersize 512 \ - -encoding binary \ -translation binary fileevent $fd writable [list \ write_update_index \ @@ -227,7 +225,6 @@ proc checkout_index {msg path_list after capture_error} { -blocking 0 \ -buffering full \ -buffersize 512 \ - -encoding binary \ -translation binary fileevent $fd writable [list \ write_checkout_index \ diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 2c9bb3af40..44be4ed3ff 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -90,7 +90,7 @@ proc merge_load_stages {path cont} { set merge_stages_fd [git_read [list ls-files -u -z -- $path]] - fconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary + fconfigure $merge_stages_fd -blocking 0 -translation binary fileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont] } @@ -370,7 +370,7 @@ proc merge_tool_start {cmdline target backup stages} { ui_status [mc "Running merge tool..."] - fconfigure $mtool_fd -blocking 0 -translation binary -encoding binary + fconfigure $mtool_fd -blocking 0 -translation binary fileevent $mtool_fd readable [list read_mtool_output $mtool_fd] } |