git, branch v2.6.0-rc1

Git 2.6-rc1

2015-09-08T22:38:43Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/builtin-am-signoff-regression-fix'

2015-09-08T22:35:05Z

Recent "git am" had regression when adding a Signed-off-by line with its "-s" option by an unintended tightening of how an existing trailer block is detected. * jc/builtin-am-signoff-regression-fix: am: match --signoff to the original scripted version

am: match --signoff to the original scripted version

2015-09-07T02:59:40Z

Linus noticed that the recently reimplemented "git am -s" defines the trailer block too rigidly, resulting in an unnecessary blank line between the existing sign-offs and his new sign-off. An e-mail submission sent to Linus in real life ends with mixture of sign-offs and commentaries, e.g. title here message here Signed-off-by: Original Author [rv: tweaked frotz and nitfol] Signed-off-by: Re Viewer Signed-off-by: Other Reviewer --- patch here Because the reimplementation reused append_signoff() helper that is used by other codepaths, which is unaware that people intermix such comments with their sign-offs in the trailer block, such a message was judged to end with a non-trailer, resulting in an extra blank line before adding a new sign-off. The original scripted version of "git am" used a lot looser definition, i.e. "if and only if there is no line that begins with Signed-off-by:, add a blank line before adding a new sign-off". For the upcoming release, stop using the append_signoff() in "git am" and reimplement the looser definition used by the scripted version to use only in "git am" to fix this regression in "am" while avoiding new regressions to other users of append_signoff(). In the longer term, we should look into loosening append_signoff() so that other codepaths that add a new sign-off behave the same way as "git am -s", but that is a task for post-release. Reported-by: Linus Torvalds Signed-off-by: Junio C Hamano

Sync with maint

2015-09-04T21:34:57Z

* maint:

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 'jc/calloc-pathspec' into maint

2015-09-04T02:18:00Z

Minor code cleanup. * jc/calloc-pathspec: ps_matched: xcalloc() takes nmemb and then element size