git/t, branch v2.5.2

Merge branch 'ee/clean-test-fixes' into maint

2015-09-04T02:18:05Z

* ee/clean-test-fixes: t7300: fix broken && chains

Merge branch 'jk/log-missing-default-HEAD' into maint

2015-09-04T02:18:04Z

"git init empty && git -C empty log" said "bad default revision 'HEAD'", which was found to be a bit confusing to new users. * jk/log-missing-default-HEAD: log: diagnose empty HEAD more clearly

Merge branch 'cc/trailers-corner-case-fix' into maint

2015-09-04T02:18:03Z

The "interpret-trailers" helper mistook a multi-paragraph title of a commit log message with a colon in it as the end of the trailer block. * cc/trailers-corner-case-fix: trailer: support multiline title trailer: retitle a test and correct an in-comment message trailer: ignore first line of message

Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update' into maint

2015-09-04T02:18:02Z

When re-priming the cache-tree opportunistically while committing the in-core index as-is, we mistakenly invalidated the in-core index too aggressively, causing the experimental split-index code to unnecessarily rewrite the on-disk index file(s). * dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update: commit: don't rewrite shared index unnecessarily

Merge branch 'rs/archive-zip-many' into maint

2015-09-04T02:18:01Z

"git archive" did not use zip64 extension when creating an archive with more than 64k entries, which nobody should need, right ;-)? * rs/archive-zip-many: archive-zip: support more than 65535 entries archive-zip: use a local variable to store the creator version t5004: test ZIP archives with many entries

Merge branch 'sg/t3020-typofix' into maint

2015-09-04T02:17:55Z

* sg/t3020-typofix: t3020: fix typo in test description

Merge branch 'jk/fix-alias-pager-config-key-warnings' into maint

2015-09-04T02:17:52Z

Because the configuration system does not allow "alias.0foo" and "pager.0foo" as the configuration key, the user cannot use '0foo' as a custom command name anyway, but "git 0foo" tried to look these keys up and emitted useless warnings before saying '0foo is not a git command'. These warning messages have been squelched. * jk/fix-alias-pager-config-key-warnings: config: silence warnings for command names with invalid keys

Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint

2015-09-04T02:17:51Z

Test updates for Windows. * nd/dwim-wildcards-as-pathspecs: t2019: skip test requiring '*' in a file name non Windows

Merge branch 'ps/t1509-chroot-test-fixup' into maint

2015-09-04T02:17:50Z

t1509 test that requires a dedicated VM environment had some bitrot, which has been corrected. * ps/t1509-chroot-test-fixup: tests: fix cleanup after tests in t1509-root-worktree tests: fix broken && chains in t1509-root-worktree

trailer: support multiline title

2015-08-31T18:14:08Z

We currently ignore the first line passed to `git interpret-trailers`, when looking for the beginning of the trailers. Unfortunately this does not work well when a commit is created with a line break in the title, using for example the following command: git commit -m 'place of code: change we made' That's why instead of ignoring only the first line, it is better to ignore the first paragraph. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano