delta/git.git, branch da/difftool-test

t7800: Test difftool passing arguments to diff

2012-03-19T16:41:34+00:00

git-difftool relies on the ability to forward unknown arguments
to the git-diff command.  Add a test to ensure that this works
as advertised.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

Merge branch 'ab/perl-i18n'

2012-03-16T16:16:17+00:00

* ab/perl-i18n:
  perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
  Git::I18N: compatibility with perl <5.8.3

perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER

2012-03-16T16:15:28+00:00

When I added the i18n infrastructure in v1.7.8-rc2-1-g5e9637c I forgot
to install Git::I18N also when NO_PERL_MAKEMAKER=YesPlease was
set. Change the generation of the fallback perl.mak file to do that.

Now Git/I18N.pm is installed alongside Git.pm in such a way that
anything that uses GITPERLLIB will find it.

Reported-by: Tom G. Christensen 
Signed-off-by: Ævar Arnfjörð Bjarmason 
Signed-off-by: Junio C Hamano

Update draft release notes to 1.7.10

2012-03-16T15:42:22+00:00

Signed-off-by: Junio C Hamano

Merge branch 'th/mergetools-deltawalker'

2012-03-16T15:24:20+00:00

* th/mergetools-deltawalker:
  Documentation/difftool: add deltawalker to list of valid diff tools

Merge branch 'jc/maint-verify-objects-remove-pessimism'

2012-03-16T15:23:53+00:00

The code to validate the history connectivity between old refs and new
refs used by fetch and receive-pack, introduced in 1.7.8, was grossly
inefficient and unnecessarily tried to re-validate integrity of individual
objects. This essentially reverts that performance regression.

* jc/maint-verify-objects-remove-pessimism:
  fetch/receive: remove over-pessimistic connectivity check

Merge branch 'sl/customize-sane-tool-path'

2012-03-16T15:23:35+00:00

* sl/customize-sane-tool-path:
  configure: allow user to prevent $PATH "sanitization" on Solaris

Merge "two fixes for fast-import's 'ls' command" from Jonathan

2012-03-16T15:19:18+00:00

Andrew Sayers noticed that the svn-fe | git fast-import pipeline
mishandles a subversion history that copies the root directory to a
sub-directory (e.g. doing `svn cp . trunk` to standardise your
layout).  As David Barr explained, the bug arises when the following
command is sent to git fast-import:

  'ls' SP ':1' SP LF

Instead of reading back what is at the root of r1, it unconditionally
reports the path as missing.

After sleeping on it, here are two patches for 'maint'.  One plugs a
memory leak.  The other ensures that trying to pass an empty path to
the 'ls' command results in an error message that can help the
frontend author instead of the silently broken conversion Andrew
found.

Then we can carefully add 'ls ""' support in 1.7.11.

* commit 'refs/pull-request-tags/jn/maint-fast-import-empty-ls':
  fast-import: don't allow 'ls' of path with empty components
  fast-import: leakfix for 'ls' of dirty trees

Merge branch 'th/git-diffall'

2012-03-16T04:54:42+00:00

* th/git-diffall:
  contrib/diffall: fix cleanup trap on Windows
  contrib/diffall: eliminate duplicate while loops
  contrib/diffall: eliminate use of tar
  contrib/diffall: create tmp dirs without mktemp
  contrib/diffall: comment actual reason for 'cdup'

Merge branch 'th/doc-diff-submodule-option'

2012-03-16T04:54:31+00:00

* th/doc-diff-submodule-option:
  Documentation/diff-options: reword description of --submodule option