git, branch v1.5.6.5

GIT 1.5.6.5

2008-08-06T20:40:53Z

Signed-off-by: Junio C Hamano

Files given on the command line are relative to $cwd

2008-08-06T20:38:18Z

When running "git commit -F file" and "git tag -F file" from a subdirectory, we should take it as relative to the directory we started from, not relative to the top-level directory. This adds a helper function "parse_options_fix_filename()" to make it more convenient to fix this class of issues. Ideally, parse_options() should support a new type of option, "OPT_FILENAME", to do this uniformly, but this patch is meant to go to 'maint' to fix it minimally. One thing to note is that value for "commit template file" that comes from the command line is taken as relative to $cwd just like other parameters, but when it comes from the configuration varilable 'commit.template', it is taken as relative to the working tree root as before. I think this difference actually is sensible (not that I particularly think commit.template itself is sensible). Signed-off-by: Junio C Hamano

fix diff-tree --stdin documentation

2008-08-06T06:30:11Z

Long time ago, the feature of "diff-tree --stdin" to take a commit and its parents on one line was broken, and did not support the common: git rev-list --parents $commits... -- $paths... | git diff-tree --stdin -v -p usage pattern by Porcelains properly. For diff-tree to talk sensibly about commits, it needs to see commits, not just trees; the code was fixed to take list of commits on the standard input in 1.2.0. However we left the documentation stale for a long time, until Karl Hasselström finally noticed it very recently. Signed-off-by: Junio C Hamano

RelNotes 1.5.6.5 updates

2008-08-06T04:20:59Z

Signed-off-by: Junio C Hamano

diff.renamelimit is a basic diff configuration

2008-08-06T01:27:31Z

The configuration was added as a core option in 3299c6f (diff: make default rename detection limit configurable., 2005-11-15), but 9ce392f (Move diff.renamelimit out of default configuration., 2005-11-21) separated diff-related stuff out of the core. Up to that point it was Ok. When we separated the Porcelain options out of the git_diff_config in 83ad63c (diff: do not use configuration magic at the core-level, 2006-07-08), we should have been more careful. This mistake made diff-tree plumbing and git-show Porcelain to notice different set of renames when the user explicitly asked for rename detection. Signed-off-by: Junio C Hamano

git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.

2008-08-05T18:40:28Z

Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano

Documentation: typos / spelling fixes in older RelNotes

2008-08-05T18:38:11Z

Signed-off-by: Mike Ralphson Signed-off-by: Junio C Hamano

git-name-rev: don't use printf without format

2008-08-03T19:48:41Z

printf() without an explicit format string is not a good coding practise, unless the printed string is guaranteed to not contain percent signs. While fixing this, we might as well combine the calls to fwrite() and printf(). Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

git-name-rev: allow --name-only in combination with --stdin

2008-08-02T18:07:50Z

Signed-off-by: Pieter de Bie Signed-off-by: Junio C Hamano

builtin-name-rev.c: split deeply nested part from the main function

2008-08-02T18:04:22Z

The main function of this command implementation tries to do too many things. Split out a handling of single input line into a separate function to reduce nesting level and clutter. Signed-off-by: Junio C Hamano