diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-08 11:17:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-08 11:18:06 -0800 |
| commit | fe47c9cb5f98e305a15db24b8a9f62151ae65d8d (patch) | |
| tree | 7efca0534124565539fe12f47f847fdc3980f0d3 /git-gui/lib/branch.tcl | |
| parent | The final batch before -rc2 (diff) | |
| parent | Merge branch 'zs/open-current-file' (diff) | |
| download | git-fe47c9cb5f98e305a15db24b8a9f62151ae65d8d.tar.gz git-fe47c9cb5f98e305a15db24b8a9f62151ae65d8d.zip | |
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui:
git-gui: allow opening currently selected file in default app
git-gui: allow closing console window with Escape
git gui: fix branch name encoding error
git-gui: revert untracked files by deleting them
git-gui: update status bar to track operations
git-gui: consolidate naming conventions
Diffstat (limited to 'git-gui/lib/branch.tcl')
| -rw-r--r-- | git-gui/lib/branch.tcl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui/lib/branch.tcl b/git-gui/lib/branch.tcl index 777eeb79c1..8b0c485889 100644 --- a/git-gui/lib/branch.tcl +++ b/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 |