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

GIT 1.5.6.4

2008-07-19T17:58:01Z

Signed-off-by: Junio C Hamano

builtin-rm: fix index lock file path

2008-07-19T17:41:17Z

When hold_locked_index() is called with a relative git_dir and you are outside the work tree, the lock file become relative to the current directory. So when later setup_work_tree() change the current directory it breaks lock file path and commit_locked_index() fails. This patch move index locking code after setup_work_tree() call to make lock file relative to the working tree as it should be and add a test case. Noticed by Nick Andrew. Signed-off-by: Olivier Marin Signed-off-by: Junio C Hamano

Merge branch 'sp/maint-index-pack' into maint

2008-07-18T22:39:51Z

* sp/maint-index-pack: index-pack: Honor core.deltaBaseCacheLimit when resolving deltas index-pack: Track the object_entry that creates each base_data index-pack: Chain the struct base_data on the stack for traversal index-pack: Refactor base arguments of resolve_delta into a struct

http-fetch: do not SEGV after fetching a bad pack idx file

2008-07-18T07:11:40Z

Signed-off-by: Junio C Hamano

rev-list: honor --quiet option

2008-07-18T06:36:16Z

Nick Andrew noticed that rev-list lets --quiet option to be parsed by underlying diff_options parser but did not pick up the result. This resulted in --quiet option to become effectively a no-op. Signed-off-by: Junio C Hamano

api-run-command.txt: typofix

2008-07-18T03:50:06Z

Replace "run_command_v_opt_dir" by "run_command_v_opt_cd". Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano

Start preparing 1.5.6.4 release notes

2008-07-16T22:55:51Z

Signed-off-by: Junio C Hamano

git fetch-pack: do not complain about "no common commits" in an empty repo

2008-07-16T22:53:43Z

If the repo is empty, it is obvious that there are no common commits when fetching from _anywhere_. So there is no use in saying it in that case, and it can even be annoying. Therefore suppress the message unilaterally if the repository is empty prior to the fetch. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'js/maint-pretty-mailmap' into maint

2008-07-16T22:27:03Z

* js/maint-pretty-mailmap: Add pretty format %aN which gives the author name, respecting .mailmap

Merge branch 'sp/maint-bash-completion-optim' into maint

2008-07-16T22:25:24Z

* sp/maint-bash-completion-optim: bash completion: Resolve git show ref:path losing ref: portion bash completion: Append space after file names have been completed bash completion: Don't offer "a.." as a completion for "a." bash completion: Improve responsiveness of git-log completion