git/lib, branch gitgui-0.18.0

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: 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

git-gui: remove .git/CHERRY_PICK_HEAD after committing

2012-09-17T10:59:05Z

Adding _git_ps1() to one's bash prompt displays various repo status info after each command. After committing a git cherry-pick -n using git-gui, the prompt still contains the "|CHERRY-PICKING" flag. Delete the file causing this flag when cleaning up. Signed-off-by: Beat Bolli Signed-off-by: Pat Thoyts

git-gui: Fix a loose/lose mistake

2012-09-17T10:53:37Z

Acked-by: Junio C Hamano Signed-off-by: Beat Bolli Signed-off-by: Pat Thoyts

git-gui: fix git-gui crash due to uninitialized variable

2012-01-22T23:16:03Z

Recently, a clone initiated via git gui on Windows crashed on me due to an "unknown variable cdone". It turns out that there is a code path where this variable is used uninitialized. Signed-off-by: Clemens Buchacher Signed-off-by: Pat Thoyts

git-gui: handle shell script text filters when loading for blame.

2011-12-09T15:14:32Z

When loading a file into the blame window git-gui does all the work and must handle the text conversion filters if defined. On Windows it is necessary to detect the need for a shell script explicitly. Such filter commands are run using non-blocking I/O but this has the unfortunate side effect of losing any error that might be reported when the pipe is closed. Switching to blocking mode just before closing enables reporting of errors in the filter scripts to the user. Tested-by: Sebastian Schuberth Signed-off-by: Pat Thoyts

git-gui: don't warn for detached head when rebasing

2011-11-05T00:39:04Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: make config gui.warndetachedcommit a boolean

2011-11-05T00:39:03Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts