git/t, branch v2.9.3

Merge branch 'jk/difftool-in-subdir' into maint

2016-08-12T16:16:57Z

"git difftool ..." started in a subdirectory failed to interpret the paths relative to that directory, which has been fixed. * jk/difftool-in-subdir: difftool: use Git::* functions instead of passing around state difftool: avoid $GIT_DIR and $GIT_WORK_TREE difftool: fix argument handling in subdirs

Merge branch 'rs/use-strbuf-addstr' into maint

2016-08-10T18:55:34Z

* rs/use-strbuf-addstr: use strbuf_addstr() instead of strbuf_addf() with "%s" use strbuf_addstr() for adding constant strings to a strbuf

Merge branch 'jk/t4205-cleanup' into maint

2016-08-10T18:55:32Z

Test modernization. * jk/t4205-cleanup: t4205: indent here documents t4205: drop top-level &&-chaining

Merge branch 'nd/fbsd-lazy-mtime' into maint

2016-08-10T18:55:30Z

FreeBSD can lie when asked mtime of a directory, which made the untracked cache code to fall back to a slow-path, which in turn caused tests in t7063 to fail because it wanted to verify the behaviour of the fast-path. * nd/fbsd-lazy-mtime: t7063: work around FreeBSD's lazy mtime update feature

Merge branch 'js/t4130-rename-without-ino' into maint

2016-08-10T18:55:30Z

Windows port was failing some tests in t4130, due to the lack of inum in the returned values by its lstat(2) emulation. * js/t4130-rename-without-ino: t4130: work around Windows limitation

Merge branch 'jc/grep-commandline-vs-configuration' into maint

2016-08-10T18:55:29Z

"git -c grep.patternType=extended log --basic-regexp" misbehaved because the internal API to access the grep machinery was not designed well. * jc/grep-commandline-vs-configuration: grep: further simplify setting the pattern type

Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint

2016-08-10T18:55:28Z

There is an optimization used in "git diff $treeA $treeB" to borrow an already checked-out copy in the working tree when it is known to be the same as the blob being compared, expecting that open/mmap of such a file is faster than reading it from the object store, which involves inflating and applying delta. This however kicked in even when the checked-out copy needs to go through the convert-to-git conversion (including the clean filter), which defeats the whole point of the optimization. The optimization has been disabled when the conversion is necessary. * jk/diff-do-not-reuse-wtf-needs-cleaning: diff: do not reuse worktree files that need "clean" conversion

Merge branch 'mm/status-suggest-merge-abort' into maint

2016-08-10T18:55:19Z

"git status" learned to suggest "merge --abort" during a conflicted merge, just like it already suggests "rebase --abort" during a conflicted rebase. * mm/status-suggest-merge-abort: status: suggest 'git merge --abort' when appropriate

Merge branch 'rs/submodule-config-code-cleanup' into maint

2016-08-08T21:21:46Z

Code cleanup. * rs/submodule-config-code-cleanup: submodule-config: fix test binary crashing when no arguments given submodule-config: combine early return code into one goto submodule-config: passing name reference for .gitmodule blobs submodule-config: use explicit empty string instead of strbuf in config_from()

Merge branch 'nd/test-helpers' into maint

2016-08-08T21:21:43Z

Build clean-up. * nd/test-helpers: t/test-lib.sh: fix running tests with --valgrind Makefile: use VCSSVN_LIB to refer to svn library Makefile: drop extra dependencies for test helpers