git, branch v1.5.4-rc2

GIT 1.5.4-rc2

2007-12-27T02:16:52Z

Although everybody was quiet during the Christmas holiday, it's been a week since -rc1, so here is -rc2. Signed-off-by: Junio C Hamano

Merge branch 'rs/pretty-safety'

2007-12-27T01:52:40Z

* rs/pretty-safety: Make "--pretty=format" parser a bit more careful.

Make "--pretty=format" parser a bit more careful.

2007-12-27T01:52:32Z

When a commit message that does not have a terminating LF is read in and the memory that was allocated to read it happens to have a LF immediately after that, the code was not careful and went past the terminating NUL. Signed-off-by: Junio C Hamano

contrib: resurrect scripted git-revert.

2007-12-27T01:38:00Z

Signed-off-by: Junio C Hamano

Merge branch 'ar/commit-cleanup'

2007-12-27T01:35:38Z

* ar/commit-cleanup: Allow selection of different cleanup modes for commit messages builtin-commit: avoid double-negation in the code. builtin-commit: fix amending of the initial commit t7005: do not exit inside test.

Fix rewrite_diff() name quoting.

2007-12-27T01:13:36Z

This moves the logic to quote two paths (prefix + path) in C-style introduced in the previous commit from the dump_quoted_path() in combine-diff.c to quote.c, and uses it to fix rewrite_diff() that never C-quoted the pathnames correctly. Signed-off-by: Junio C Hamano

combine-diff: Fix path quoting

2007-12-27T00:51:19Z

Earlier when showing combined diff, the filenames on the ---/+++ header lines were quoted incorrectly. a/ (or b/) prefix was output literally and then the path was output, with c-quoting. This fixes the quoting logic, and while at it, adjusts the code to use the customizable prefix (a_prefix and b_prefix) introduced recently. Signed-off-by: Junio C Hamano

Fix documentation of --first-parent in git-log and copy it to git-rev-list

2007-12-27T00:05:54Z

Credit goes to Avi Kivity for noticing the lack of description in rev-list manual page. Signed-off-by: Junio C Hamano

Fix "git log --diff-filter" bug

2007-12-26T19:57:36Z

In commit b7bb760d5ed4881422673d32f869d140221d3564 (Fix revision log diff setup, avoid unnecessary diff generation) an optimization was made to avoid unnecessary diff generation. This was partly fixed in 99516e35d096f41e7133cacde8fbed8ee9a3ecd0 (Fix embarrassing "git log --follow" bug). The '--diff-filter' option also needs the diff machinery in action. Signed-off-by: Arjen Laarhoven Signed-off-by: Junio C Hamano

Improve error messages when int/long cannot be parsed from config

2007-12-26T19:37:45Z

If a config file has become mildly corrupted due to a missing LF we may discover some other option joined up against the end of a numeric value. For example: [section] number = 1auto where the "auto" flag was meant to occur on the next line, below "number", but the missing LF has caused it to no longer be its own option. Instead the word "auto" is parsed as a 'unit factor' for the value of "number". Before this change we got the confusing error message: fatal: unknown unit: 'auto' which told us nothing about where the problem appeared. Now we get: fatal: bad config value for 'aninvalid.unit' which at least points the user in the right direction of where to search for the incorrectly formatted configuration file. Noticed by erikh on #git, which received the original error from a simple `git checkout -b` due to a midly corrupted config. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano