git, branch v1.6.5.5

Git 1.6.5.5

2009-12-05T19:08:35Z

Signed-off-by: Junio C Hamano

Fix diff -B/--dirstat miscounting of newly added contents

2009-12-05T18:54:17Z

What used to happen is that diffcore_count_changes() simply ignored any hashes in the destination that didn't match hashes in the source. EXCEPT if the source hash didn't exist at all, in which case it would count _one_ destination hash that happened to have the "next" hash value. As a consequence, newly added material was often undercounted, making output from --dirstat and "complete rewrite" detection used by -B unrelialble. This changes it so that: - whenever it bypasses a destination hash (because it doesn't match a source), it counts the bytes associated with that as "literal added" - at the end (once we have used up all the source hashes), we do the same thing with the remaining destination hashes. - when hashes do match, and we use the difference in counts as a value, we also use up that destination hash entry (the 'd++'). Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

reset: improve worktree safety valves

2009-12-05T18:28:20Z

The existing code checked to make sure we were not in a bare repository when doing a hard reset. However, we should take this one step further, and make sure we are in a worktree. Otherwise, we can end up munging files inside of '.git'. Furthermore, we should do the same check for --merge resets, which have the same properties. Actually, a merge reset of HEAD^ would already complain, since further down in the code we want a worktree. However, it is nicer to check up-front; then we are sure we cover all cases ("git reset --merge" would run, even though it wasn't doing anything) and we can give a more specific message. Add tests to t7103 to cover these cases and some missing ones. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Documentation: Avoid use of xmlto --stringparam

2009-12-05T18:03:49Z

The --stringparam option is not available on older xmlto versions. Instead, set man.base.url.for.relative.links via a .xsl file. Older docbook versions will ignore this without causing grief to users of older xmlto versions. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

archive: clarify description of path parameter

2009-12-04T23:16:40Z

Mention that path parameters are based on the current working directory. Signed-off-by: Rene Scharfe -- Documentation/git-archive.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Junio C Hamano

rerere: don't segfault on failure to open rr-cache

2009-12-04T17:11:58Z

The rr-cache directory should always exist if we are doing garbage collection (earlier code paths check this explicitly), but we may not necessarily succeed in opening it (for example, due to permissions problems). In that case, we should print an error message rather than simply segfaulting. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Prepare for 1.6.5.5

2009-12-03T22:07:32Z

Signed-off-by: Junio C Hamano

Merge branch 'uk/maint-shortlog-encoding' into maint

2009-12-03T21:56:50Z

* uk/maint-shortlog-encoding: t4201: use ISO8859-1 rather than ISO-8859-1 shortlog: respect commit encoding

Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint

2009-12-03T21:54:25Z

* fc/maint-format-patch-pathspec-dashes: format-patch: add test for parsing of "--" format-patch: fix parsing of "--" on the command line

Merge branch 'ap/maint-merge-strategy-list-fix' into maint

2009-12-03T21:54:11Z

* ap/maint-merge-strategy-list-fix: builtin-merge.c: call exclude_cmds() correctly.