summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Thomas Witt <pyromaniac@exherbo.org> 2019-02-03 12:20:49 +0100
committerAvatar Thomas Witt <pyromaniac@exherbo.org> 2019-02-03 12:20:49 +0100
commitfa3b0f330a6e16e7808a58c61f3e8798e30aff7e (patch)
treef97d5eb8ef98fb302bc98e6adbfb16e20883095d
parentf643daaf1c682b9b1c7e36ffa95c44ce3308405f (diff)
downloadarbor-zsh.tar.gz
arbor-zsh.tar.xz
zsh-5.7: Fix VCS_INFOzsh
Change-Id: I9a67c8a60f949dc82d28b9d3e41663b7916ae8ad
-rw-r--r--packages/app-shells/zsh/files/zsh-5.7-fix_broken_vcs_info.patch37
-rw-r--r--packages/app-shells/zsh/zsh-5.7-r1.exheres-0 (renamed from packages/app-shells/zsh/zsh-5.7.exheres-0)2
2 files changed, 39 insertions, 0 deletions
diff --git a/packages/app-shells/zsh/files/zsh-5.7-fix_broken_vcs_info.patch b/packages/app-shells/zsh/files/zsh-5.7-fix_broken_vcs_info.patch
new file mode 100644
index 000000000..e0a8e1b2d
--- /dev/null
+++ b/packages/app-shells/zsh/files/zsh-5.7-fix_broken_vcs_info.patch
@@ -0,0 +1,37 @@
+[PATCH] Fix broken VCS_Info in 5.7
+
+http://www.zsh.org/mla/workers/2019/msg00058.html
+
+A bunch of Arch users are reporting that VCS_Info is broken:
+
+ https://bugs.archlinux.org/task/61533
+
+To replicate it you just need to run vcs_info outside of a repo:
+
+ % zsh -f
+ % autoload -Uz vcs_info
+ % vcs_info
+ VCS_INFO_detect_p4:79: maximum nested function level reached; increase FUNCNEST?
+
+This is apparently due to workers/43618, which introduced a function-def guard
+to a function that wants to redefine itself. Just taking that back out seems
+to fix it.
+
+Wish they'd mentioned it to #zsh an hour or two ago :(
+
+dana
+
+Upstream-status: Backport
+
+
+diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+index d171c68ee..5ec21da9f 100644
+--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
++++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
+@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
+ }
+
+
+-(( ${+functions[VCS_INFO_detect_p4]} )) ||
+ VCS_INFO_detect_p4() {
+ local serverport p4where
diff --git a/packages/app-shells/zsh/zsh-5.7.exheres-0 b/packages/app-shells/zsh/zsh-5.7-r1.exheres-0
index 49eaba70d..e9afc9dd4 100644
--- a/packages/app-shells/zsh/zsh-5.7.exheres-0
+++ b/packages/app-shells/zsh/zsh-5.7-r1.exheres-0
@@ -7,3 +7,5 @@ PLATFORMS="~amd64 ~arm ~armv7 ~armv8 ~x86"
UPSTREAM_RELEASE_NOTES="http://zsh.sourceforge.net/releases.html"
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-fix_broken_vcs_info.patch )
+