git, branch v2.4.1

Git 2.4.1

2015-05-13T21:11:43Z

Signed-off-by: Junio C Hamano

Merge branch 'sb/line-log-plug-pairdiff-leak' into maint

2015-05-13T21:05:56Z

* sb/line-log-plug-pairdiff-leak: line-log.c: fix a memleak

Merge branch 'sb/test-bitmap-free-at-end' into maint

2015-05-13T21:05:56Z

* sb/test-bitmap-free-at-end: pack-bitmap.c: fix a memleak

Merge branch 'nd/t1509-chroot-test' into maint

2015-05-13T21:05:55Z

Correct test bitrot. * nd/t1509-chroot-test: t1509: update prepare script to be able to run t1509 in chroot again

Merge branch 'jk/type-from-string-gently' into maint

2015-05-13T21:05:54Z

"git cat-file bl $blob" failed to barf even though there is no object type that is "bl". * jk/type-from-string-gently: type_from_string_gently: make sure length matches

Merge branch 'ep/fix-test-lib-functions-report' into maint

2015-05-13T21:05:53Z

* ep/fix-test-lib-functions-report: test-lib-functions.sh: fix the second argument to some helper functions

Merge branch 'cn/bom-in-gitignore' into maint

2015-05-13T21:05:51Z

Teach the codepaths that read .gitignore and .gitattributes files that these files encoded in UTF-8 may have UTF-8 BOM marker at the beginning; this makes it in line with what we do for configuration files already. * cn/bom-in-gitignore: attr: skip UTF8 BOM at the beginning of the input file config: use utf8_bom[] from utf.[ch] in git_parse_source() utf8-bom: introduce skip_utf8_bom() helper add_excludes_from_file: clarify the bom skipping logic dir: allow a BOM at the beginning of exclude files

Merge branch 'jk/prune-mtime' into maint

2015-05-13T21:05:50Z

Access to objects in repositories that borrow from another one on a slow NFS server unnecessarily got more expensive due to recent code becoming more cautious in a naive way not to lose objects to pruning. * jk/prune-mtime: sha1_file: only freshen packs once per run sha1_file: freshen pack objects before loose reachable: only mark local objects as recent

Merge branch 'jk/init-core-worktree-at-root' into maint

2015-05-13T21:05:49Z

We avoid setting core.worktree when the repository location is the ".git" directory directly at the top level of the working tree, but the code misdetected the case in which the working tree is at the root level of the filesystem (which arguably is a silly thing to do, but still valid). * jk/init-core-worktree-at-root: init: don't set core.worktree when initializing /.git

Sync with 2.3.8

2015-05-11T21:39:28Z

Signed-off-by: Junio C Hamano