git, branch gitgui-0.18.0

git-gui 0.18

2013-06-15T22:53:34Z

Signed-off-by: Pat Thoyts

git-gui: avoid an error message when removing the last remote

2013-06-15T22:36:27Z

When the last remote is removed on a system that has tearoff menu items the code that adjusts the fetch and prune menus may raise an error when probing the menu entry for a non-existing -label option. Check the entry type to avoid this fault. Reported-by: Vedran Miletić Signed-off-by: Pat Thoyts

git-gui: fix file name handling with non-empty prefix

2013-06-07T22:03:29Z

Commit e3d06ca (git-gui: Detect full path when parsing arguments - 2012-10-02) fixed the handling of absolute paths passed to the browser and blame subcommands by checking whether the file exists without the prefix before prepending the prefix and checking again. Since we have chdir'd to the top level of the working tree before doing this, this does not work if a file with the same name exists in a subdirectory and at the top level (for example Makefile in git.git's t/ directory). Instead of doing this, revert that patch and fix absolute path issue by using "file join" to prepend the prefix to the supplied path. This will correctly handle absolute paths by skipping the prefix in that case. Acked-by: Andrew Wong Signed-off-by: John Keeping Signed-off-by: Pat Thoyts

git-gui: bring wish process to front on Mac

2013-06-07T00:34:42Z

On Mac OS X, any application that is started from the Terminal will open behind all running applications; as a work-around, manually bring ourselves to the front. (Stolen from gitk, commit 76bf6ff93e.) We do this as the very first thing, so that any message boxes that might pop up during the rest of the startup sequence are actually seen by the user. [PT: added catch and moved down to ensure Tk has been loaded] Signed-off-by: Stefan Haller Signed-off-by: Pat Thoyts

git-gui: change dialog button positions for Windows to suit platform.

2013-05-17T09:51:01Z

On windows it is more common to have cancel furthest on the right. Signed-off-by: Pat Thoyts

git-gui: allow "\ No newline at end of file" for linewise staging

2013-05-16T22:40:59Z

Counting of lines did not skip this line when generating the hunk header. Acked-by: Tobias Preuss Signed-off-by: Heiko Voigt Signed-off-by: Pat Thoyts

git-gui: fix the mergetool launcher for the Beyond Compare tool.

2013-02-22T20:13:21Z

When using Beyond Compare as the mergetool it fails to save the merged result correctly due to a quoting problem when executing the tool. This patch solves the quoting problem. Signed-off-by: Warren Falk Signed-off-by: Pat Thoyts

Makefile: replace "echo 1>..." with "echo >..."

2012-12-25T00:21:59Z

This is clearer to many people this way. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano Signed-off-by: Pat Thoyts

French translation: copy -> copie.

2012-11-28T21:29:21Z

Signed-off-by: Pat Thoyts

git-gui: Fix parsing of

2012-11-13T23:52:14Z

Commit e3d06ca9 (git-gui: Detect full path when parsing arguments) broke git gui blame rev path-not-present-in-worktree in particular this does not work anymore: # in linux.git $ git gui blame 2bb8c26242c2393b097a993ffe9b003ec9b85395 drivers/net/sky2.c This patch restores the original functionality in this case. Acked-by: Andrew Wong Signed-off-by: Kirill Smelkov Signed-off-by: Pat Thoyts