diff options
author | Thomas Gummerer <t.gummerer@gmail.com> | 2013-05-22 09:40:39 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-22 10:14:01 -0700 |
commit | d0583da838afbc5e039b9f0cbbb9b1fb3aa1f1ae (patch) | |
tree | fbbb27588b9d393b965546561765f5592b184431 /builtin/merge-file.c | |
parent | Git 1.8.2.3 (diff) | |
download | tgif-d0583da838afbc5e039b9f0cbbb9b1fb3aa1f1ae.tar.xz |
prompt: fix show upstream with svn and zsh
Currently the __git_ps1 git prompt gives the following error with a
repository converted by git-svn, when used with zsh:
__git_ps1_show_upstream:19: bad pattern: svn_remote[
__git_ps1_show_upstream:45: bad substitution
To reproduce the problem, the __git_ps1_show_upstream function can be
executed in a repository converted with git-svn. Both those errors are
triggered by spaces after the '['.
Zsh also doesn't support initializing an array with `local var=(...)`.
This triggers the following error:
__git_ps1_show_upstream:41: bad pattern: svn_upstream=(commit
Use
local -a
var=(...)
instead to make is compatible.
This was introduced by 6d158cba (bash completion: Support "divergence
from upstream" messages in __git_ps1), when the script was for bash
only.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Acked-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions