git, branch v1.5.2-rc2

GIT v1.5.2-rc2

2007-05-06T08:07:04Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-05-06T07:21:03Z

* maint: Small correction in reading of commit headers Documentation: fix typo in git-remote.txt Add test for blame corner cases. blame: -C -C -C blame: Notice a wholesale incorporation of an existing file. Fix --boundary output diff format documentation: describe raw combined diff format Mention version 1.5.1 in tutorial and user-manual Add --no-rebase option to git-svn dcommit Fix markup in git-svn man page

Handle return code of parse_commit in revision machinery

2007-05-06T07:07:07Z

This fixes a crash in broken repositories where random commits suddenly disappear. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Small correction in reading of commit headers

2007-05-06T06:46:18Z

Check if a line of the header has enough characters to possibly contain the requested prefix. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Documentation: fix typo in git-remote.txt

2007-05-06T06:10:59Z

Signed-off-by: James Bowes Signed-off-by: Junio C Hamano

Add test for blame corner cases.

2007-05-06T05:40:39Z

Signed-off-by: Junio C Hamano

blame: -C -C -C

2007-05-06T05:40:27Z

When you do this, existing "blame -C -C" would not find that the latter half of the file2 came from the existing file1: ... both file1 and file2 are tracked ... $ cat file1 >>file2 $ git add file1 file2 $ git commit This is because we avoid the expensive find-copies-harder code that makes unchanged file (in this case, file1) as a candidate for copy & paste source when annotating an existing file (file2). The third -C now allows it. However, this obviously makes the process very expensive. We've actually seen this patch before, but I dismissed it because it covers such a narrow (and arguably stupid) corner case. Signed-off-by: Junio C Hamano

blame: Notice a wholesale incorporation of an existing file.

2007-05-06T05:40:13Z

The -C option to blame tries to find a section of a preimage file by running diff against the lines whose origin is still unknown, and excluding the different parts. The code however did not cover the case where the tail part of the section matched, which we handle for the normal non-move/copy codepath. This breakage was most visible when preimage file matches in its entirety and failed to pass blame in such a case. Signed-off-by: Junio C Hamano

Fix --boundary output

2007-05-06T04:09:34Z

"git log --boundary" incorrectly honoured the option only when "left-right" was enabled. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

diff format documentation: describe raw combined diff format

2007-05-04T23:58:17Z

Add description of raw combined diff format to diff-formats.txt, as "diff format for merges" section, before "Generating patches..." section. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano