git/t, branch v2.8.2

Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint

2016-04-29T21:15:58Z

When running "git blame $path" with unnormalized data in the index for the path, the data in the working tree was blamed, even though "git add" would not have changed what is already in the index, due to "safe crlf" that disables the line-end conversion. It has been corrected. * tb/blame-force-read-cache-to-workaround-safe-crlf: correct blame for files commited with CRLF

Merge branch 'sk/send-pack-all-fix' into maint

2016-04-29T21:15:57Z

"git send-pack --all " was broken when its command line option parsing was written in the 2.6 timeframe. * sk/send-pack-all-fix: git-send-pack: fix --all option when used with directory

Merge branch 'sg/diff-multiple-identical-renames' into maint

2016-04-29T21:15:55Z

"git diff -M" used to work better when two originally identical files A and B got renamed to X/A and X/B by pairing A to X/A and B to X/B, but this was broken in the 2.0 timeframe. * sg/diff-multiple-identical-renames: diffcore: fix iteration order of identical files during rename detection

Merge branch 'jv/merge-nothing-into-void' into maint

2016-04-15T01:57:49Z

"git merge FETCH_HEAD" dereferenced NULL pointer when merging nothing into an unborn history (which is arguably unusual usage, which perhaps was the reason why nobody noticed it). * jv/merge-nothing-into-void: merge: fix NULL pointer dereference when merging nothing into void

Merge branch 'ss/commit-squash-msg' into maint

2016-04-15T01:57:48Z

When "git merge --squash" stopped due to conflict, the concluding "git commit" failed to read in the SQUASH_MSG that shows the log messages from all the squashed commits. * ss/commit-squash-msg: commit: do not lose SQUASH_MSG contents

Merge branch 'da/mergetool-delete-delete-conflict' into maint

2016-04-15T01:57:47Z

"git mergetool" did not work well with conflicts that both sides deleted. * da/mergetool-delete-delete-conflict: mergetool: honor tempfile configuration when resolving delete conflicts mergetool: support delete/delete conflicts

Merge branch 'jk/startup-info' into maint

2016-04-15T01:57:46Z

The startup_info data, which records if we are working inside a repository (among other things), are now uniformly available to Git subcommand implementations, and Git avoids attempting to touch references when we are not in a repository. * jk/startup-info: use setup_git_directory() in test-* programs grep: turn off gitlink detection for --no-index mailmap: do not resolve blobs in a non-repository remote: don't resolve HEAD in non-repository setup: set startup_info->have_repository more reliably setup: make startup_info available everywhere

Merge branch 'jk/getwholeline-getdelim-empty' into maint

2016-04-15T01:57:46Z

strbuf_getwholeline() did not NUL-terminate the buffer on certain corner cases in its error codepath. * jk/getwholeline-getdelim-empty: strbuf_getwholeline: NUL-terminate getdelim buffer on error

Merge branch 'gf/fetch-pack-direct-object-fetch' into maint

2016-04-15T01:57:44Z

Fetching of history by naming a commit object name directly didn't work across remote-curl transport. * gf/fetch-pack-direct-object-fetch: fetch-pack: update the documentation for "..." arguments fetch-pack: fix object_id of exact sha1

Merge branch 'jk/rev-parse-local-env-vars' into maint

2016-04-15T01:57:44Z

The "--local-env-vars" and "--resolve-git-dir" options of "git rev-parse" failed to work outside a repository when the command's option parsing was rewritten in 1.8.5 era. * jk/rev-parse-local-env-vars: rev-parse: let some options run outside repository t1515: add tests for rev-parse out-of-repo helpers