git, branch gitgui-0.20.0

git-gui: set version 0.20

2015-04-18T11:15:32Z

Signed-off-by: Pat Thoyts

git-gui: sv.po: Update Swedish translation (547t0f0u)

2015-04-18T11:03:50Z

Signed-off-by: Peter Krefting Signed-off-by: Pat Thoyts

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

2015-04-18T10:51:39Z

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

git-gui: Makes chooser set 'gitdir' to the resolved path

2015-03-07T12:29:03Z

If _is_git follows a "gitdir: ..." file link to get to the actual repository, we want _gitdir to be set to that final path. Signed-off-by: Chris Packham Signed-off-by: Remi Rampin Signed-off-by: Pat Thoyts

git-gui: Fixes chooser not accepting gitfiles

2015-03-07T12:28:58Z

Support the case where .git is a platform independent symbolic link and not a directory. This occurs when --separate-git-dir is used when creating the local repository to store the .git directory elsewhere. git-gui does not support such repositories when using the repository chooser as the test to determine that the chosen directory is a git repository fails for such repositories. This commit enables _is_git to read the real location from the symbolic link file. Signed-off-by: Chris Packham Signed-off-by: Remi Rampin Signed-off-by: Pat Thoyts

git-gui: reinstate support for Tcl 8.4

2015-01-13T00:42:03Z

Tcl 8.5 introduced an extended vsatisfies syntax that is not supported by Tcl 8.4. Since only Tcl 8.4 is required this presents a problem. The extended syntax was used starting with Git 2.0.0 in commit b3f0c5c0 (git-gui: tolerate major version changes when comparing the git version, 2014-05-17), so that a major version change would still satisfy the condition. However, what we really want is just a basic version compare, so use vcompare instead to restore compatibility with Tcl 8.4. Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano Signed-off-by: Pat Thoyts

git-gui: fix problem with gui.maxfilesdisplayed

2015-01-05T16:13:25Z

gui.maxfilesdisplayed (added in dd6451f9c7c5a36d3006231b618ac6da06c7c7b4) was applied brute force on the file list in alphabetic order. As a result, files that had modifications might not be displayed by git-gui. Even worse, files that are already in the index might not be displayed, which makes git-gui hard to use in some workflows. This fix changes the meaning of gui.maxfilesdisplayed, making it a soft limit that only applies to "_O" files, i.e. files that are "Untracked, not staged". Signed-off-by: Csaba Kiraly Signed-off-by: Pat Thoyts

git-gui: fix verbose loading when git path contains spaces.

2014-11-07T00:37:28Z

After setting GITGUI_VERBOSE to enable load tracing the source command is redefined but fails if the git installation path has spaces. Fixed quoting by using lists to handle the arguments. Signed-off-by: Pat Thoyts

git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows

2014-11-06T22:13:32Z

Windows does not necessarily mean Cygwin, it could also be MSYS. The latter ships with a version of "kill" that does not understand "-f". In msysgit this was addressed shipping Cygwin's version of kill. Properly fix this by using the stock Windows "taskkill" command instead, which is available since Windows XP Professional. Signed-off-by: Sebastian Schuberth Signed-off-by: Pat Thoyts

git-gui: add configurable tab size to the diff view

2014-10-06T09:34:52Z

For Tk 8.5 the "wordprocessor" mode allows us to get a bit fancy for merge diffs and intend the tabs by one to compensate for the additional diff marker at the line start. The code is heavily based on how gitk handles tabs. Signed-off-by: Michael Lutz Signed-off-by: Pat Thoyts