git/t, branch v2.4.1

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

Sync with 2.3.8

2015-05-11T21:39:28Z

Signed-off-by: Junio C Hamano

Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3

2015-05-11T21:34:01Z

Documentation fix. * mm/usage-log-l-can-take-regex: log -L: improve error message on malformed argument Documentation: change -L: to -L:

Merge branch 'jc/diff-no-index-d-f' into maint-2.3

2015-05-11T21:34:00Z

The usual "git diff" when seeing a file turning into a directory showed a patchset to remove the file and create all files in the directory, but "git diff --no-index" simply refused to work. Also, when asked to compare a file and a directory, imitate POSIX "diff" and compare the file with the file with the same name in the directory, instead of refusing to run. * jc/diff-no-index-d-f: diff-no-index: align D/F handling with that of normal Git diff-no-index: DWIM "diff D F" into "diff D/F F"

Merge branch 'tb/connect-ipv6-parse-fix' into maint

2015-04-27T19:23:54Z

An earlier update to the parser that disects a URL broke an address, followed by a colon, followed by an empty string (instead of the port number), e.g. ssh://example.com:/path/to/repo. * tb/connect-ipv6-parse-fix: connect.c: ignore extra colon after hostname

Merge branch 'jk/test-annoyances' into maint

2015-04-21T19:12:24Z

Test fixes. * jk/test-annoyances: t5551: make EXPENSIVE test cheaper t5541: move run_with_cmdline_limit to test-lib.sh t: pass GIT_TRACE through Apache t: redirect stderr GIT_TRACE to descriptor 4 t: translate SIGINT to an exit

Merge branch 'tb/connect-ipv6-parse-fix'

2015-04-20T22:28:33Z

An earlier update to the parser that disects an address broke an address, followed by a colon, followed by an empty string (instead of the port number). * tb/connect-ipv6-parse-fix: connect.c: ignore extra colon after hostname