delta/git.git, branch sb/perf-without-installed-git

t/perf: make runner work even if Git is not installed

2015-09-25T17:44:59+00:00

aggregate.perl did not work when Git.pm is not installed to a directory
contained in the default Perl library path list or PERLLIB.
This commit prepends the Perl library path of the current Git source
tree to enable this.

Note that this commit adds a hard-coded relative path

  use lib '../../perl/blib/lib';

instead of the flexible environment-based variant

  use lib (split(/:/, $ENV{GITPERLLIB}));

which is used in tests written in Perl.
The hard-coded variant is used because the whole performance test
framework does it that way (and GITPERLLIB is not set there).

Signed-off-by: Stephan Beyer 
Signed-off-by: Junio C Hamano

Git 2.5.3

2015-09-17T19:16:17+00:00

Signed-off-by: Junio C Hamano

Merge branch 'dt/untracked-subdir' into maint

2015-09-17T19:12:29+00:00

The experimental untracked-cache feature were buggy when paths with
a few levels of subdirectories are involved.

* dt/untracked-subdir:
  untracked cache: fix entry invalidation
  untracked-cache: fix subdirectory handling
  t7063: use --force-untracked-cache to speed up a bit
  untracked-cache: support sparse checkout

Merge branch 'br/svn-doc-include-paths-config' into maint

2015-09-17T19:11:46+00:00

* br/svn-doc-include-paths-config:
  git-svn doc: mention "svn-remote..include-paths"

Merge branch 'ah/submodule-typofix-in-error' into maint

2015-09-17T19:11:08+00:00

Error string fix.

* ah/submodule-typofix-in-error:
  git-submodule: remove extraneous space from error message

Merge branch 'js/maint-am-skip-performance-regression' into maint

2015-09-17T19:03:02+00:00

* js/maint-am-skip-performance-regression:
  am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

2015-09-09T21:22:56+00:00

f8da6801 (am --skip: support skipping while on unborn branch,
2015-06-06) introduced a performance regression to "git am --skip",
where it used "read-tree" to reconstruct the index from scratch
without reusing the cached stat information.

This is a backport of the corresponding patch to the builtin am in 2.6:
3ecc704 (am --skip/--abort: merge HEAD/ORIG_HEAD tree into index,
2015-08-19).

Reportedly, it can make a huge difference on Windows, in one case a `git
rebase --skip` took 1m40s without, and 5s with, this patch.

cf. https://github.com/git-for-windows/git/issues/365

Reported-and-suggested-by: Kim Gybels 
Acked-by: Paul Tan 
Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

Git 2.5.2

2015-09-04T17:46:07+00:00

Signed-off-by: Junio C Hamano

Sync with 2.4.9

2015-09-04T17:43:23+00:00

Git 2.4.9

2015-09-04T17:36:14+00:00

Signed-off-by: Junio C Hamano