diff options
| author | Mark Levedahl <mlevedahl@gmail.com> | 2025-05-21 19:18:46 -0400 |
|---|---|---|
| committer | Mark Levedahl <mlevedahl@gmail.com> | 2025-07-22 12:32:58 -0400 |
| commit | 07714e220b7ee137f4645ec950383eaaeddf23d5 (patch) | |
| tree | 445c2e54a8854e262ab73bd0022ab1dc5781195a /lib/branch.tcl | |
| parent | 40f54f670a01b6ae4f13e0888796948ddce9104c (diff) | |
| download | git-07714e220b7ee137f4645ec950383eaaeddf23d5.tar.gz | |
git-gui: do not mix -translation binary and -encoding
git-gui has many instances of '-translation binary' and '-encoding
$SOMETHING' on the same channel. As eofchar is always null given a
prior commit, the net effect of having '-translation binary' in such
configuration is only to change how text line endings are handled.
For cases where the channel is opened to be consumed via gets, the eol
translation is irrelevant because Tcl's gets is documented to recognize
any of \n, \r, and \r\n as a line ending. So, keep only the '-encoding
$SOMETHING' configuration in these cases, making the configuration more
clear.
Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Diffstat (limited to 'lib/branch.tcl')
| -rw-r--r-- | lib/branch.tcl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/branch.tcl b/lib/branch.tcl index 39e0f2dc98..97c9ec1c00 100644 --- a/lib/branch.tcl +++ b/lib/branch.tcl @@ -8,7 +8,7 @@ proc load_all_heads {} { set rh_len [expr {[string length $rh] + 1}] set all_heads [list] set fd [git_read [list for-each-ref --format=%(refname) $rh]] - fconfigure $fd -translation binary -encoding utf-8 + fconfigure $fd -encoding utf-8 while {[gets $fd line] > 0} { if {!$some_heads_tracking || ![is_tracking_branch $line]} { lappend all_heads [string range $line $rh_len end] @@ -25,7 +25,7 @@ proc load_all_tags {} { --sort=-taggerdate \ --format=%(refname) \ refs/tags]] - fconfigure $fd -translation binary -encoding utf-8 + fconfigure $fd -encoding utf-8 while {[gets $fd line] > 0} { if {![regsub ^refs/tags/ $line {} name]} continue lappend all_tags $name |