git/t, branch v2.16.2

Merge branch 'nd/add-i-ignore-submodules' into maint

2018-02-15T23:18:13Z

"git add -p" was taught to ignore local changes to submodules as they do not interfere with the partial addition of regular changes anyway. * nd/add-i-ignore-submodules: add--interactive: ignore submodule changes except HEAD

Merge branch 'tg/stash-with-pathspec-fix' into maint

2018-02-15T23:18:13Z

"git stash -- " incorrectly blew away untracked files in the directory that matched the pathspec, which has been corrected. * tg/stash-with-pathspec-fix: stash: don't delete untracked files that match pathspec

Merge branch 'jk/abort-clone-with-existing-dest' into maint

2018-02-15T23:18:13Z

"git clone $there $here" is allowed even when here directory exists as long as it is an empty directory, but the command incorrectly removed it upon a failure of the operation. * jk/abort-clone-with-existing-dest: clone: do not clean up directories we didn't create clone: factor out dir_exists() helper t5600: modernize style t5600: fix outdated comment about unborn HEAD

Merge branch 'jc/merge-symlink-ours-theirs' into maint

2018-02-15T23:18:12Z

"git merge -Xours/-Xtheirs" learned to use our/their version when resolving a conflicting updates to a symbolic link. * jc/merge-symlink-ours-theirs: merge: teach -Xours/-Xtheirs to symbolic link merge

Merge branch 'dk/describe-all-output-fix' into maint

2018-02-15T23:18:10Z

An old regression in "git describe --all $annotated_tag^0" has been fixed. * dk/describe-all-output-fix: describe: prepend "tags/" when describing tags with embedded name

Merge branch 'ab/perf-grep-threads' into maint

2018-02-15T23:18:09Z

More perf tests for threaded grep * ab/perf-grep-threads: perf: amend the grep tests to test grep.threads

Merge branch 'bc/hash-algo' into maint

2018-01-22T05:12:37Z

* bc/hash-algo: t5601-clone: test case-conflicting files on case-insensitive filesystem repository: pre-initialize hash algo pointer

t5601-clone: test case-conflicting files on case-insensitive filesystem

2018-01-22T05:12:17Z

A recently introduced regression caused a segfault at clone time on case-insensitive filesystems when filenames differing only in case are present. This bug has already been fixed (repository: pre-initialize hash algo pointer, 2018-01-18), but it's not the first time similar problems have arisen. Therefore, introduce a test to catch this case and protect against future regressions. Signed-off-by: Eric Sunshine Signed-off-by: brian m. carlson Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

add--interactive: ignore submodule changes except HEAD

2018-01-16T20:32:45Z

For 'add -i' and 'add -p', the only action we can take on a dirty submodule entry is update the index with a new value from its HEAD. The content changes inside (from its own index, untracked files...) do not matter, at least until 'git add -i' learns about launching a new interactive add session inside a submodule. Ignore all other submodules changes except HEAD. This reduces the number of entries the user has to check through in 'git add -i', and the number of 'no' they have to answer to 'git add -p' when dirty submodules are present. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'js/test-with-ws-in-path'

2018-01-11T21:16:36Z

Hot fix to a test. * js/test-with-ws-in-path: t3900: add some more quotes