diff options
| author | Mark Levedahl <mlevedahl@gmail.com> | 2025-05-22 13:17:08 -0400 |
|---|---|---|
| committer | Mark Levedahl <mlevedahl@gmail.com> | 2025-07-22 12:32:58 -0400 |
| commit | f6d3ee2014e4a553ef6b783dc5d6b2d53ee70168 (patch) | |
| tree | dcf24b2c5ae61771cbbfbd22047cbaf40e2a1a8a | |
| parent | git-gui: assure -eofchar {} on all channels (diff) | |
| download | git-f6d3ee2014e4a553ef6b783dc5d6b2d53ee70168.tar.gz git-f6d3ee2014e4a553ef6b783dc5d6b2d53ee70168.zip | |
git-gui: translation binary defines iso8859-1
git-gui has many cases where -translation binary and -encoding binary
are configured on the same channel. But, -translation binary defines a
binary channel, which sets up -encoding iso8859-1 as part of its work.
Tcl 8.x defines -encoding binary as an alias of -encoding iso8859-1, and
this alias is deleted in Tcl 9.0. Let's delete the redundant encoding
definition now.
Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
| -rwxr-xr-x | git-gui.sh | 6 | ||||
| -rw-r--r-- | lib/blame.tcl | 1 | ||||
| -rw-r--r-- | lib/index.tcl | 3 | ||||
| -rw-r--r-- | lib/mergetool.tcl | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/git-gui.sh b/git-gui.sh index e9c2650bcf..07781e7d90 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1406,15 +1406,15 @@ proc rescan_stage2 {fd after} { set fd_di [git_read [list diff-index --cached --ignore-submodules=dirty -z [PARENT]]] set fd_df [git_read [list diff-files -z]] - fconfigure $fd_di -blocking 0 -translation binary -encoding binary - fconfigure $fd_df -blocking 0 -translation binary -encoding binary + fconfigure $fd_di -blocking 0 -translation binary + fconfigure $fd_df -blocking 0 -translation binary fileevent $fd_di readable [list read_diff_index $fd_di $after] fileevent $fd_df readable [list read_diff_files $fd_df $after] if {[is_config_true gui.displayuntracked]} { set fd_lo [git_read [concat ls-files --others -z $ls_others]] - fconfigure $fd_lo -blocking 0 -translation binary -encoding binary + fconfigure $fd_lo -blocking 0 -translation binary fileevent $fd_lo readable [list read_ls_others $fd_lo $after] incr rescan_active } 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] } |