git-gui: Localize commit/author dates when displaying them

[git.git] / git-gui.sh

diff --git a/git-gui.sh b/git-gui.sh
index daab7e44bbbb35621bfff12fd7a667e997311528..36ba849cc85bc801662d26e6169b822368e8ef7f 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1029,7 +1029,11 @@ proc read_ls_others {fd after} {
        set pck [split $buf_rlo "\0"]
        set buf_rlo [lindex $pck end]
        foreach p [lrange $pck 0 end-1] {
-               merge_state [encoding convertfrom $p] ?O
+               set p [encoding convertfrom $p]
+               if {[string index $p end] eq {/}} {
+                       set p [string range $p 0 end-1]
+               }
+               merge_state $p ?O
        }
        rescan_done $fd buf_rlo $after
 }