user/sven/git.git, branch v1.5.0.7

GIT 1.5.0.7

2007-04-04T02:27:41Z

Not that this release really matters, as we will be doing 1.5.1 tomorrow. This commit is to tie the loose ends and merge all of "maint" branch into "master" in preparation. Signed-off-by: Junio C Hamano

rerere should not repeat the earlier hunks in later ones

2007-04-04T02:01:36Z

When a file has more then one conflicting hunks, it repeated the contents of previous hunks in output for later ones. Signed-off-by: Junio C Hamano

git-upload-pack: make sure we close unused pipe ends

2007-03-29T08:41:23Z

Right now, we don't close the read end of the pipe when git-upload-pack runs git-pack-object, so we hang forever (why don't we get SIGALRM?) instead of dying with SIGPIPE if the latter dies, which seems to be the norm if the client disconnects. Thanks to Johannes Schindelin for pointing out where this close() needed to go. This patch has been tested on kernel.org for several weeks and appear to resolve the problem of git-upload-pack processes hanging around forever. Signed-off-by: H. Peter Anvin Signed-off-by: Junio C Hamano (cherry picked from commit 465b3518a9ad5080a4b652ef35fb13c61a93e7a4)

Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.

2007-03-29T08:38:28Z

Please see http://bugs.debian.org/404795: In git-rev-parse(1), there is an example commit tree, which is used twice. The explanation for this tree is very clear: B and C are commit *parents* to A. However, when the tree is reused as an example in the SPECIFYING RANGES, the manpage author screws up and uses A as a commit *parent* to B and C! I.e., he inverts the tree. And the fact that for this example you need to read the tree backwards is not explained anywhere (and it would be confusing even if it was). Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano

Documentation/git-svnimport.txt: fix typo.

2007-03-29T08:38:11Z

This was noticed by Frederik Schwarzer. SVN's repository by default has trunk, tags/, and branch_es_/. Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano

GIT 1.5.0.6

2007-03-28T22:28:14Z

commit: fix pretty-printing of messages with "\nencoding "

2007-03-28T22:06:18Z

The function replace_encoding_header is given the whole commit buffer, including the commit message. When looking for the encoding header, if none was found in the header, it would locate any line in the commit message matching "\nencoding " and remove it. Instead, we now make sure to search only to the end of the header. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

t4118: be nice to non-GNU sed

2007-03-28T21:54:30Z

Elias Pipping: > I'm on a mac, hence /usr/bin/sed is not gnu sed, which makes > t4118 fail. Signed-off-by: Johannes Schindelin Ack'd-by: Elias Pipping Signed-off-by: Junio C Hamano

git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly

2007-03-28T10:34:55Z

It still looks at the working tree and checks for locally modified paths. When are preparing a temporary index from HEAD, we do not want any of that. Signed-off-by: Junio C Hamano

Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

2007-03-25T22:07:27Z

* 'maint' of git://linux-nfs.org/~bfields/git: user-manual: introduce "branch" and "branch head" differently glossary: clean up cross-references glossary: stop generating automatically user-manual: Use def_ instead of ref_ for glossary references. user-manual.txt: fix a tiny typo. user-manual: run xsltproc without --nonet option