git, branch gitgui-0.21.0

git-gui: set version 0.21

2016-10-20T10:19:43Z

Signed-off-by: Pat Thoyts

Merge branch 'as/bulgarian' into pu

2016-10-20T10:13:42Z

git-gui: Mark 'All' in remote.tcl for translation

2016-10-20T10:13:03Z

Signed-off-by: Alexander Shopov Signed-off-by: Pat Thoyts

git-gui i18n: Updated Bulgarian translation (565,0f,0u)

2016-10-20T10:12:50Z

Signed-off-by: Alexander Shopov Signed-off-by: Pat Thoyts

Merge branch 'os/preserve-author' into pu

2016-10-20T10:07:24Z

Merge branch 'kb/unicode' into pu

2016-10-20T10:06:28Z

git-gui: avoid persisting modified author identity

2016-10-06T21:18:47Z

Commit 7e71adc77f fixes a problem with git-gui failing to pick up the original author identity during a commit --amend operation. However, the new author details then become persistent for the remainder of the session. This commit fixes this by ensuring the environment variables are reset and the author information reset once the commit is completed. The relevant changes were reworked to reduce global variables. Signed-off-by: Pat Thoyts

git-gui: handle the encoding of Git's output correctly

2016-10-06T08:23:21Z

If we use 'eval exec $opt $cmdp $args' to execute git command, tcl engine will convert the output of the git comand with the rule system default code page to unicode. But cp936 -> unicode conversion implicitly done by exec is not reversible. So we have to use git_read instead. Bug report and an original reproducer by Cloud Chou: https://github.com/msysgit/git/issues/302 Cloud Chou find the reason of the bug. Thanks-to: Johannes Schindelin Thanks-to: Pat Thoyts Reported-by: Cloud Chou <515312382@qq.com> Original-test-by: Cloud Chou <515312382@qq.com> Signed-off-by: Karsten Blees Signed-off-by: Cloud Chou <515312382@qq.com> Signed-off-by: Johannes Schindelin Signed-off-by: Pat Thoyts

git-gui: unicode file name support on windows

2016-10-06T08:21:50Z

Assumes file names in git tree objects are UTF-8 encoded. On most unix systems, the system encoding (and thus the TCL system encoding) will be UTF-8, so file names will be displayed correctly. On Windows, it is impossible to set the system encoding to UTF-8. Changing the TCL system encoding (via 'encoding system ...', e.g. in the startup code) is explicitly discouraged by the TCL docs. Change git-gui functions dealing with file names to always convert from and to UTF-8. Signed-off-by: Karsten Blees Signed-off-by: Pat Thoyts

Merge branch 'dr/ru' into pu

2016-10-04T22:29:40Z