git, branch v1.7.7-rc3

Git 1.7.7-rc3

2011-09-23T22:35:57Z

Signed-off-by: Junio C Hamano

Merge 1.7.6.4 in

2011-09-23T22:31:08Z

Signed-off-by: Junio C Hamano

merge-recursive: Do not look at working tree during a virtual ancestor merge

2011-09-23T22:21:01Z

Fix another instance of a recursive merge incorrectly paying attention to the working tree file during a virtual ancestor merge, that resulted in spurious and useless "addinfo_cache failed" error message. Signed-off-by: Junio C Hamano

Git 1.7.6.4

2011-09-23T21:43:05Z

Signed-off-by: Junio C Hamano

Merge branch 'cb/maint-ls-files-error-report' into maint

2011-09-23T21:30:49Z

* cb/maint-ls-files-error-report: t3005: do not assume a particular order of stdout and stderr of git-ls-files ls-files: fix pathspec display on error

describe: Refresh the index when run with --dirty

2011-09-23T21:28:17Z

When running git describe --dirty the index should be refreshed. Previously the cached index would cause describe to think that the index was dirty when, in reality, it was just stale. The issue was exposed by python setuptools which hardlinks files into another directory when building a distribution. Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-clone-alternates' into maint

2011-09-23T21:27:33Z

* jc/maint-clone-alternates: clone: clone from a repository with relative alternates clone: allow more than one --reference

Merge branch 'nd/maint-clone-gitdir' into maint

2011-09-23T21:21:39Z

* nd/maint-clone-gitdir: clone: allow to clone from .git file read_gitfile_gently(): rename misnamed function to read_gitfile()

Merge branch 'mh/check-ref-format-print-normalize' into maint

2011-09-23T21:20:51Z

* mh/check-ref-format-print-normalize: Forbid DEL characters in reference names check-ref-format --print: Normalize refnames that start with slashes

Merge branch 'mg/branch-set-upstream-previous' into maint

2011-09-23T21:16:22Z

* mg/branch-set-upstream-previous: branch.c: use the parsed branch name