git/t, branch v2.0.0

Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"

2014-05-20T21:48:11Z

Instead of showing a warning and working as before, fail and show the message and force immediate upgrade from their upstream repositories when these tools are run, per request from their primary author. Signed-off-by: Junio C Hamano

Merge branch 'jc/graduate-remote-hg-bzr' (early part)

2014-05-20T00:12:36Z

* 'jc/graduate-remote-hg-bzr' (early part): remote-helpers: point at their upstream repositories contrib: remote-helpers: add move warnings (v2.0) Revert "Merge branch 'fc/transport-helper-sync-error-fix'"

Revert "Merge branch 'fc/transport-helper-sync-error-fix'"

2014-05-20T00:09:57Z

This reverts commit d508e4a8e2391ae2596403b6478d01cf3d5f928f, reversing changes made to e42552135a2a396f37053a89f44952ea907870b2. The author of the original topic says he broke the upcoming 2.0 release with something that relates to "synchronization crash regression" while refusing to give further specifics, so this would unfortunately be the safest option for the upcoming release. Signed-off-by: Junio C Hamano

Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'

2014-05-19T23:10:10Z

* rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't assume the shell expands the value of PS1

git-prompt.sh: don't assume the shell expands the value of PS1

2014-05-19T23:09:53Z

Not all shells subject the prompt string to parameter expansion. Test whether the shell will expand the value of PS1, and use the result to control whether raw ref names are included directly in PS1. This fixes a regression introduced in commit 8976500 ("git-prompt.sh: don't put unsanitized branch names in $PS1"): zsh does not expand PS1 by default, but that commit assumed it did. The bug resulted in prompts containing the literal string '${__git_ps1_branch_name}' instead of the actual branch name. Reported-by: Caleb Thompson Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano

Merge branch 'lt/request-pull'

2014-05-19T17:35:36Z

* lt/request-pull: request-pull: resurrect for-linus -> tags/for-linus DWIM

request-pull: resurrect for-linus -> tags/for-linus DWIM

2014-05-16T17:18:25Z

Older versions of Git before v1.7.10 did not DWIM $ git pull $URL for-linus to the tag "tags/for-linus" and the users were required to say $ git pull $URL tags/for-linus instead. Because newer versions of Git works either way, request-pull used to show tags/for-linus when asked $ git request-pull origin/master $URL for-linus The recent updates broke this and in the output we see "for-linus" without the "tags/" prefix. As v1.7.10 is more than 2 years old, this should matter very little in practice, but resurrecting it is very simple. Signed-off-by: Junio C Hamano

Merge branch 'km/git-svn-workaround-older-getopt-long'

2014-05-02T20:10:58Z

* km/git-svn-workaround-older-getopt-long: t9117: use --prefix "" instead of --prefix=""

Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'

2014-05-02T20:10:53Z

* rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't put unsanitized branch names in $PS1

Merge branch 'fc/transport-helper-sync-error-fix'

2014-04-24T19:31:34Z

Make sure the marks are not written out when the transport helper did not finish happily, to avoid leaving a marks file that is out of sync with the reality. * fc/transport-helper-sync-error-fix: t5801 (remote-helpers): cleanup environment sets transport-helper: fix sync issue on crashes transport-helper: trivial cleanup transport-helper: propagate recvline() error pushing remote-helpers: make recvline return an error transport-helper: remove barely used xchgline()