git, branch v1.5.2.2

GIT 1.5.2.2

2007-06-16T08:13:35Z

Signed-off-by: Junio C Hamano

Documentation: adjust to AsciiDoc 8

2007-06-16T08:11:16Z

It turns out that the attribute definition we have had for a long time to hide "^" character from AsciiDoc 7 was not honored by AsciiDoc 8 even under "-a asciidoc7compatible" mode. There is a similar breakage with the "compatible" mode with + characters. The double colon at the end of definition list term needs to be attached to the term, without a whitespace. After this minimum fixups, AsciiDoc 8 (I used 8.2.1 on Debian) with compatibility mode seems to produce reasonably good results. Signed-off-by: Junio C Hamano

Avoid diff cost on "git log -z"

2007-06-16T06:48:35Z

Johannes and Marco discovered that "git log -z" spent cycles in diff even though there is no need to actually compute diffs. Signed-off-by: Junio C Hamano

git-branch --track: fix tracking branch computation.

2007-06-16T06:35:32Z

The original code did not take hierarchical branch names into account at all. [jc: cherry-picked 11f68d9 from 'master'] Tested-by: Gerrit Pape Signed-off-by: Junio C Hamano

$EMAIL is a last resort fallback, as it's system-wide.

2007-06-16T06:33:06Z

$EMAIL is a system-wide setup that is used for many many many applications. If the git user chose a specific user.email setup, then _this_ should be honoured rather than $EMAIL. [jc: cherry-picked ec563e8 from 'master'] Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

merge-recursive: refuse to merge binary files

2007-06-16T06:28:10Z

[jc: cherry-picked 9f30855 from 'master'] Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Move buffer_is_binary() to xdiff-interface.h

2007-06-16T06:27:23Z

We already have two instances where we want to determine if a buffer contains binary data as opposed to text. [jc: cherry-picked 6bfce93e from 'master'] Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Add a local implementation of hstrerror for the system which do not have it

2007-06-16T05:48:34Z

The function converts the value of h_errno (last error of name resolver library, see netdb.h). One of systems which supposedly do not have the function is SunOS. POSIX does not mandate its presence. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Generated spec file to be ignored is named git.spec and not git-core.spec

2007-06-16T05:43:58Z

Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

Merge branch 'ar/clone' into maint

2007-06-13T03:48:31Z

* ar/clone: Fix clone to setup the origin if its name ends with .git