git/builtin, branch v2.9.0

Merge branch 'sb/submodule-helper-relative-path'

2016-06-06T21:18:55Z

A bash-ism "local" has been removed from "git submodule" scripted Porcelain. * sb/submodule-helper-relative-path: submodule: remove bashism from shell script

Merge branch 'sb/submodule-helper-list-signal-unmatch-via-exit-status'

2016-06-06T21:18:55Z

The way how "submodule--helper list" signals unmatch error to its callers has been updated. * sb/submodule-helper-list-signal-unmatch-via-exit-status: submodule--helper: offer a consistent API

Merge branch 'rs/apply-name-terminate'

2016-06-03T21:38:04Z

Code clean-up. * rs/apply-name-terminate: apply: remove unused parameters from name_terminate()

Merge branch 'rs/patch-id-use-skip-prefix'

2016-06-03T21:38:03Z

Code clean-up. * rs/patch-id-use-skip-prefix: patch-id: use starts_with() and skip_prefix()

submodule: remove bashism from shell script

2016-06-01T18:32:53Z

Junio pointed out `relative_path` was using bashisms via the local variables. As the longer term goal is to rewrite most of the submodule code in C, do it now. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

submodule--helper: offer a consistent API

2016-06-01T18:31:49Z

In 48308681 (2016-02-29, git submodule update: have a dedicated helper for cloning), the helper communicated errors back only via exit code, and dance with printing '#unmatched' in case of error was left to git-submodule.sh as it uses the output of the helper and pipes it into shell commands. This change makes the helper consistent by never printing '#unmatched' in the helper but always handling these piping issues in the actual shell script. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'jk/cat-file-buffered-batch-all'

2016-05-31T19:40:54Z

"git cat-file --batch-all" has been sped up, by taking advantage of the fact that it does not have to read a list of objects, in two ways. * jk/cat-file-buffered-batch-all: cat-file: default to --buffer when --batch-all-objects is used cat-file: avoid noop calls to sha1_object_info_extended

patch-id: use starts_with() and skip_prefix()

2016-05-30T00:10:05Z

Get rid of magic numbers and avoid running over the end of a NUL terminated string by using starts_with() and skip_prefix() instead of memcmp(). Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

apply: remove unused parameters from name_terminate()

2016-05-30T00:05:38Z

Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

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

2016-05-23T21:54: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