diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·20+0100 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·45+0100 |
| commit | f4609b896fac842433bd495c166d5987852a6a73 (patch) | |
| tree | 95511c465c54c4f5d27e5d39ce187e2a1dd82bd3 /third_party/git/git-gui/lib/branch.tcl | |
| parent | 082c006c04343a78d87b6c6ab3608c25d6213c3f (diff) | |
merge(3p/git): Merge git subtree at v2.29.2 r/1890
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
Diffstat (limited to 'third_party/git/git-gui/lib/branch.tcl')
| -rw-r--r-- | third_party/git/git-gui/lib/branch.tcl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/git/git-gui/lib/branch.tcl b/third_party/git/git-gui/lib/branch.tcl index 777eeb79c1..8b0c485889 100644 --- a/third_party/git/git-gui/lib/branch.tcl +++ b/third_party/git/git-gui/lib/branch.tcl @@ -8,6 +8,7 @@ proc load_all_heads {} { set rh_len [expr {[string length $rh] + 1}] set all_heads [list] set fd [git_read for-each-ref --format=%(refname) $rh] + fconfigure $fd -translation binary -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] @@ -24,6 +25,7 @@ proc load_all_tags {} { --sort=-taggerdate \ --format=%(refname) \ refs/tags] + fconfigure $fd -translation binary -encoding utf-8 while {[gets $fd line] > 0} { if {![regsub ^refs/tags/ $line {} name]} continue lappend all_tags $name |