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

GIT 1.5.0.2

2007-02-26T08:26:06Z

Signed-off-by: Junio C Hamano

git-remote: support remotes with a dot in the name

2007-02-26T08:24:41Z

[jc: the original from Pavel was limiting the variable names to only fetch and url, but I loosened it to take valid variable names.] [jc: cherry-picked from 'master', since people seem to be reinventing this many times.] Signed-off-by: Pavel Roskin Signed-off-by: Junio C Hamano

Documentation: describe "-f/-t/-m" options to "git-remote add"

2007-02-26T07:50:29Z

Signed-off-by: Junio C Hamano

diff --cc: fix display of symlink conflicts during a merge.

2007-02-26T06:25:30Z

"git-diff-files --cc" to show conflicts during merge did not pass the correct mode information for the working tree down, and showed bogus combined diff. Signed-off-by: Junio C Hamano

Merge branch 'jc/merge-symlink' into maint

2007-02-26T03:09:59Z

* jc/merge-symlink: merge-recursive: fix longstanding bug in merging symlinks merge-index: fix longstanding bug in merging symlinks

merge-recursive: fix longstanding bug in merging symlinks

2007-02-26T03:08:48Z

Commit 3af244ca added unlink(2) before running symlink(2) to update the working tree with the merge result, but it was unlinking a wrong path. This resulted in loss of the path pointed by a symlink. Signed-off-by: Junio C Hamano

merge-index: fix longstanding bug in merging symlinks

2007-02-26T03:08:48Z

Ancient commit e2b6a9d0 added code to pass "file modes" from merge-index to merge-one-file, and then later commit 54dd99a1 wanted to make sure we do not end up creating a nonsense symlink that points at a path whose name contains conflict markers. However, nobody noticed that the code in merge-index added by e2b6a9d0 were stripping the S_IFMT bits and the code in 54dd99a1 was meaningless. This fixes it. Signed-off-by: Junio C Hamano

Add Release Notes to prepare for 1.5.0.2

2007-02-25T18:53:42Z

Signed-off-by: Junio C Hamano

Allow arbitrary number of arguments to git-pack-objects

2007-02-25T18:50:12Z

If a repository ever gets in a situation where there are too many packs (more than 60 or so), perhaps because of frequent use of git-fetch -k or incremental git-repack, then it becomes impossible to fully repack the repository with git-repack -a. That command just dies with the cryptic message fatal: too many internal rev-list options This message comes from git-pack-objects, which is passed one command line option like --unpacked=pack-.pack for each pack file to be repacked. However, the current code has a static limit of 64 command line arguments and just aborts if more arguments are passed to it. Fix this by dynamically allocating the array of command line arguments, and doubling the size each time it overflows. Signed-off-by: Roland Dreier Signed-off-by: Junio C Hamano

rerere: do not deal with symlinks.

2007-02-25T09:29:43Z

Who would use multi-line symlinks that would benefit from rerere? Just ignore them. Signed-off-by: Junio C Hamano