git/builtin, branch v2.9.2

Merge branch 'sb/clone-shallow-passthru' into maint

2016-07-11T17:44:12Z

Fix an unintended regression in v2.9 that breaks "clone --depth" that recurses down to submodules by forcing the submodules to also be cloned shallowly, which many server instances that host upstream of the submodules are not prepared for. * sb/clone-shallow-passthru: clone: do not let --depth imply --shallow-submodules

Merge branch 'km/fetch-do-not-free-remote-name' into maint

2016-07-11T17:44:10Z

The ownership rule for the piece of memory that hold references to be fetched in "git fetch" was screwy, which has been cleaned up. * km/fetch-do-not-free-remote-name: builtin/fetch.c: don't free remote->name after fetch

Merge branch 'jc/deref-tag' into maint

2016-07-06T20:06:46Z

Code clean-up. * jc/deref-tag: blame, line-log: do not loop around deref_tag()

Merge branch 'et/add-chmod-x' into maint

2016-07-06T20:06:39Z

"git update-index --add --chmod=+x file" may be usable as an escape hatch, but not a friendly thing to force for people who do need to use it regularly. "git add --chmod=+x file" can be used instead. * et/add-chmod-x: add: add --chmod=+x / --chmod=-x options

Merge branch 'jk/rev-list-count-with-bitmap' into maint

2016-06-27T16:56:24Z

"git rev-list --count" whose walk-length is limited with "-n" option did not work well with the counting optimized to look at the bitmap index. * jk/rev-list-count-with-bitmap: rev-list: disable bitmaps when "-n" is used with listing objects rev-list: "adjust" results of "--count --use-bitmap-index -n"

clone: do not let --depth imply --shallow-submodules

2016-06-20T18:35:28Z

In v2.9.0, we prematurely flipped the default to force cloning submodules shallowly, when the superproject is getting cloned shallowly. This is likely to fail when the upstream repositories submodules are cloned from a repository that is not prepared to serve histories that ends at a commit that is not at the tip of a branch, and we know the world is not yet ready. Use a safer default to clone the submodules fully, unless the user tells us that she knows that the upstream repository of the submodules are willing to cooperate with "--shallow-submodules" option. Noticed-by: Vadim Eisenberg Helped-by: Jeff King Helped-by: Stefan Beller Signed-off-by: Junio C Hamano

blame, line-log: do not loop around deref_tag()

2016-06-14T20:38:14Z

These callers appear to expect that deref_tag() is to peel one layer of a tag, but the function does not work that way; it has its own loop to unwrap tags until an object that is not a tag appears. Signed-off-by: Junio C Hamano

builtin/fetch.c: don't free remote->name after fetch

2016-06-14T18:58:05Z

Make fetch's string_list of remote names own all of its string items (strdup'ing when necessary) so that it can deallocate them safely when clearing. Signed-off-by: Keith McGuigan Signed-off-by: Junio C Hamano

add: add --chmod=+x / --chmod=-x options

2016-06-08T00:43:39Z

The executable bit will not be detected (and therefore will not be set) for paths in a repository with `core.filemode` set to false, though the users may still wish to add files as executable for compatibility with other users who _do_ have `core.filemode` functionality. For example, Windows users adding shell scripts may wish to add them as executable for compatibility with users on non-Windows. Although this can be done with a plumbing command (`git update-index --add --chmod=+x foo`), teaching the `git-add` command allows users to set a file executable with a command that they're already familiar with. Signed-off-by: Edward Thomson Helped-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'ar/diff-args-osx-precompose' into maint

2016-06-06T21:27:35Z

Many commands normalize command line arguments from NFD to NFC variant of UTF-8 on OSX, but commands in the "diff" family did not, causing "git diff $path" to complain that no such path is known to Git. They have been taught to do the normalization. * ar/diff-args-osx-precompose: diff: run arguments through precompose_argv