git/contrib, branch v2.6.4

Merge branch 'sg/bash-prompt-dirty-orphan' into maint

2015-12-08T22:05:02Z

Produce correct "dirty" marker for shell prompts, even when we are on an orphan or an unborn branch. * sg/bash-prompt-dirty-orphan: bash prompt: indicate dirty index even on orphan branches bash prompt: remove a redundant 'git diff' option bash prompt: test dirty index and worktree while on an orphan branch

bash prompt: indicate dirty index even on orphan branches

2015-11-24T20:27:01Z

__git_ps1() doesn't indicate dirty index while on an orphan branch. To check the dirtiness of the index, __git_ps1() runs 'git diff-index --cached ... HEAD', which doesn't work on an orphan branch, because HEAD doesn't point to a valid commit. Run 'git diff ... --cached' instead, as it does the right thing both on valid and invalid HEAD, i.e. compares the index to the existing HEAD in the former case and to the empty tree in the latter. This fixes the two failing tests added in the first commit of this series. The dirtiness of the worktree is already checked with 'git diff' and is displayed correctly even on an orphan branch. Signed-off-by: SZEDER Gábor Signed-off-by: Jeff King

bash prompt: remove a redundant 'git diff' option

2015-11-24T20:27:01Z

To get the dirty state indicator __git_ps1() runs 'git diff' with '--quiet --exit-code' options. '--quiet' already implies '--exit-code', so the latter is unnecessary and can be removed. Signed-off-by: SZEDER Gábor Signed-off-by: Jeff King

Escape Git's exec path in contrib/rerere-train.sh script

2015-11-20T11:43:00Z

Whitespace can cause the source command to fail. This is usually not a problem on Unix systems, but on Windows Git is likely to be installed under "C:/Program Files/", thus rendering the script broken. Signed-off-by: Daniel Knittl-Frank Signed-off-by: Jeff King

Merge branch 'pt/pull-builtin' into maint

2015-10-16T21:32:32Z

* pt/pull-builtin: pull: enclose in brackets in the usage string merge: grammofix in please-commit-before-merge message

merge: grammofix in please-commit-before-merge message

2015-10-02T21:29:56Z

Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano

Merge branch 'js/maint-am-skip-performance-regression'

2015-09-14T21:59:13Z

Recent versions of scripted "git am" has a performance regression in "git am --skip" codepath, which no longer exists in the built-in version on the 'master' front. Fix the regression in the last scripted version that appear in 2.5.x maintenance track and older. * js/maint-am-skip-performance-regression: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

Merge branch 'sg/config-name-only'

2015-08-31T22:38:50Z

"git config --list" output was hard to parse when values consist of multiple lines. "--name-only" option is added to help this. * sg/config-name-only: get_urlmatch: avoid useless strbuf write format_config: simplify buffer handling format_config: don't init strbuf config: restructure format_config() for better control flow completion: list variable names reliably with 'git config --name-only' config: add '--name-only' option to list only variable names

Merge branch 'ep/http-configure-ssl-version'

2015-08-26T22:45:31Z

A new configuration variable http.sslVersion can be used to specify what specific version of SSL/TLS to use to make a connection. * ep/http-configure-ssl-version: http: add support for specifying the SSL version

Sync with maint

2015-08-25T23:09:30Z

* maint: pull: pass upload_pack only when it was given