git, branch v1.6.3-rc4

GIT 1.6.3-rc4

2009-05-02T06:31:00Z

Signed-off-by: Junio C Hamano

Merge git://repo.or.cz/git-gui

2009-05-02T05:11:57Z

* git://repo.or.cz/git-gui: git-gui: Fixes for Mac OS X TkAqua git-gui: Update Russian translation git-gui: run post-checkout hook after clone git-gui: Ensure consistent usage of mergetool.keepBackup git-gui: fix use of undeclared variable diff_empty_count git-gui (Win): make starting via "Git GUI Here" on .git/ possible git-gui (Win): make "Explore Working Copy" more robust git-gui: run post-checkout hook on checkout git-gui: When calling post-commit hook wrong variable was cleared. git-gui: use `git --html-path` to get the location of installed HTML docs git-gui: fix deleting from the context menu with empty selection git-gui: minor spelling fix and string factorisation. git-gui: various French translation fixes git-gui: Fix merge conflict display error when filename contains spaces git-gui: don't hide the Browse button when resizing the repo chooser Append ampersand to "Target" of lnk files created by do_cygwin_shortcut git-gui: Support more git version notations. git-gui: Avoid an infinite rescan loop in handle_empty_diff. git-gui: Fix post-commit status with subject in non-locale encoding

ctype.c: fix typo in comment

2009-05-01T23:07:29Z

Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Fix a bunch of pointer declarations (codestyle)

2009-05-01T22:17:31Z

Essentially; s/type* /type */ as per the coding guidelines. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

git-gui: Fixes for Mac OS X TkAqua

2009-05-01T22:04:52Z

- detect more Tk.framework variants - fix apple menu setup, use native preferences menu item - don't set menu font Signed-off-by: Daniel A. Steffen Signed-off-by: Shawn O. Pearce

Merge git://git.kernel.org/pub/scm/gitk/gitk

2009-05-01T02:56:28Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add Russian translation gitk: Fix compare-commits function when we have local changes gitk: Avoid crash if closed while reading references gitk: Handle external diff tool with spaces in the path gitk: Remember and restore the window state with the geometry gitk: Map KP_Divide to focus the search box gitk: Mark some more strings for translation gitk: Mark forgotten string for translation gitk: Make .gitk a hidden file under windows gitk: Add a command to compare two strings of commits gitk: Add a way to mark a commit, plus a "find descendant" command gitk: Fixes for Mac OS X TkAqua gitk: Provide a 32x32 window icon based on the git logo gitk: Provide a window icon if possible gitk: Handle blobs containing a DOS end-of-file marker

gitk: Add Russian translation

2009-04-30T23:34:24Z

Thanks go to Dmitry Potapov for proofreading and suggested translation of the word 'merge'. Signed-off-by: Alex Riesen Signed-off-by: Paul Mackerras

improve error message in config.c

2009-04-30T01:37:58Z

Show errno if opening a lockfile fails. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-04-29T23:50:31Z

* maint: diff -c -p: do not die on submodules Conflicts: combine-diff.c

daemon.c: fix segfault on OS X

2009-04-29T23:50:21Z

On OS X (and maybe other unices), getaddrinfo(3) returns NULL in the ai_canonname field if it's called with an IP address for the hostname. We'll now use the IP address for the hostname if ai_canonname was NULL, this also matches the behaviour on Linux. steps to reproduce: $ git daemon --export-all $ git clone git://127.0.0.1/frotz => git daemon's fork (silently) segfaults. Remove the pointless loop while at it. There is only one iteration because of the break; on the last line and there are no continues. Signed-off-by: Benjamin Kramer Signed-off-by: Junio C Hamano