git/t, branch v2.13.2

Merge branch 'sd/t3200-branch-m-test' into maint

2017-06-24T22:29:34Z

New test. * sd/t3200-branch-m-test: t3200: add test for single parameter passed to -m option

Merge branch 'km/test-mailinfo-b-failure' into maint

2017-06-24T22:29:33Z

New tests. * km/test-mailinfo-b-failure: t5100: add some more mailinfo tests

Merge branch 'ps/stash-push-pathspec-fix' into maint

2017-06-24T22:29:30Z

"git stash push " did not work from a subdirectory at all. Bugfix for a topic in v2.13 * ps/stash-push-pathspec-fix: git-stash: fix pushing stash with pathspec from subdir

Merge branch 'jk/pack-idx-corruption-safety' into maint

2017-06-24T22:29:29Z

A flaky test has been corrected. * jk/pack-idx-corruption-safety: t5313: make extended-table test more deterministic

Merge branch 'jk/diff-blob' into maint

2017-06-24T22:29:28Z

The result from "git diff" that compares two blobs, e.g. "git diff $commit1:$path $commit2:$path", used to be shown with the full object name as given on the command line, but it is more natural to use the $path in the output and use it to look up .gitattributes. * jk/diff-blob: diff: use blob path for blob/file diffs diff: use pending "path" if it is available diff: use the word "path" instead of "name" for blobs diff: pass whole pending entry in blobinfo handle_revision_arg: record paths for pending objects handle_revision_arg: record modes for "a..b" endpoints t4063: add tests of direct blob diffs get_sha1_with_context: dynamically allocate oc->path get_sha1_with_context: always initialize oc->symlink_path sha1_name: consistently refer to object_context as "oc" handle_revision_arg: add handle_dotdot() helper handle_revision_arg: hoist ".." check out of range parsing handle_revision_arg: stop using "dotdot" as a generic pointer handle_revision_arg: simplify commit reference lookups handle_revision_arg: reset "dotdot" consistently

Merge branch 'jc/name-rev-lw-tag' into maint

2017-06-24T22:29:28Z

"git describe --contains" penalized light-weight tags so much that they were almost never considered. Instead, give them about the same chance to be considered as an annotated tag that is the same age as the underlying commit would. * jc/name-rev-lw-tag: name-rev: favor describing with tags and use committer date to tiebreak name-rev: refactor logic to see if a new candidate is a better name

Merge branch 'ab/t3070-test-dedup' into maint

2017-06-13T20:27:04Z

Test cleanup. * ab/t3070-test-dedup: wildmatch test: remove redundant duplicate test

Merge branch 'jh/memihash-opt' into maint

2017-06-13T20:27:04Z

perf-test update. * jh/memihash-opt: p0004: don't error out if test repo is too small p0004: don't abort if multi-threaded is too slow p0004: use test_perf p0004: avoid using pipes p0004: simplify calls of test-lazy-init-name-hash

Merge branch 'tb/pull-ff-rebase-autostash' into maint

2017-06-13T20:27:03Z

"git pull --rebase --autostash" didn't auto-stash when the local history fast-forwards to the upstream. * tb/pull-ff-rebase-autostash: pull: ff --rebase --autostash works in dirty repo

Merge branch 'sl/clean-d-ignored-fix' into maint

2017-06-13T20:27:02Z

"git clean -d" used to clean directories that has ignored files, even though the command should not lose ignored ones without "-x". "git status --ignored" did not list ignored and untracked files without "-uall". These have been corrected. * sl/clean-d-ignored-fix: clean: teach clean -d to preserve ignored paths dir: expose cmp_name() and check_contains() dir: hide untracked contents of untracked dirs dir: recurse into untracked dirs for ignored files t7061: status --ignored should search untracked dirs t7300: clean -d should skip dirs with ignored files