git, branch v1.6.0-rc2

GIT 1.6.0-rc2

2008-08-06T21:00:36Z

Signed-off-by: Junio C Hamano

perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section

2008-08-06T21:00:36Z

Use double quotes to protect against paths which may contain spaces. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Sync with 1.5.6.5

2008-08-06T20:50:48Z

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

Merge git://repo.or.cz/git-gui

2008-08-06T20:32:18Z

* git://repo.or.cz/git-gui: git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' git-gui: add a part about format strings in po/README git-gui: update po/it.po git-gui: update Japanese translation git-gui: Update swedish translation. git-gui: Update git-gui.pot for 0.11 nearing release git-gui: Update German translation

Merge git://git.kernel.org/pub/scm/gitk/gitk

2008-08-06T20:32:12Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Update swedish translation. gitk: Updated German translation gitk: Fallback to selecting the head commit upon load gitk: Fixed automatic row selection during load gitk: Fixed broken exception handling in diff gitk: On Windows, use a Cygwin-specific flag for kill gitk: Arrange to kill diff-files & diff-index on quit gitk: Kill back-end processes on window close

Merge branch 'rs/archive-parse-options'

2008-08-06T20:31:38Z

* rs/archive-parse-options: archive: allow --exec and --remote without equal sign

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

Optimize sha1_object_info for loose objects, not concurrent repacks

2008-08-06T04:21:20Z

When dealing with a repository with lots of loose objects, sha1_object_info would rescan the packs directory every time an unpacked object was referenced before finally giving up and looking for the loose object. This caused a lot of extra unnecessary system calls during git pack-objects; the code was rereading the entire pack directory once for each loose object file. This patch looks for a loose object before falling back to rescanning the pack directory, rather than the other way around. Signed-off-by: Steven Grimm Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano