[Pkg-zsh-commits] [zsh] 02/03: Remove cherry-picked patch

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit 972e1fe6abeecb65e40aa3687161eca90ca24452
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Dec 6 21:54:13 2016 +0100

    Remove cherry-picked patch
---
 ...-output-from-interactive-test-more-robust.patch | 27 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 28 deletions(-)

diff --git a/debian/patches/cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch b/debian/patches/cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch
deleted file mode 100644
index 7b13b01..0000000
--- a/debian/patches/cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: atttempt to make interactive param test more robust
-Origin: af2ab0247265a04ac74c0ffadf8213bc1af28e41
-Author: Peter Stephenson <p.w.stephenson at ntlworld.com>
-
---- a/Test/D04parameter.ztst
-+++ b/Test/D04parameter.ztst
-@@ -97,16 +97,17 @@
- 
-   PROMPT="" $ZTST_testdir/../Src/zsh -fis <<<'
-   unsetopt PROMPT_SP
--  PS2="" PS3="" PS4="" RPS1="" RPS2=""
-+  PS1="" PS2="" PS3="" PS4="" RPS1="" RPS2=""
-+  exec 2>&1
-   foo() {
-       print ${1:?no arguments given}
-       print not reached
-   }
-   foo
-   print reached
--  '
-+  ' 2>/dev/null
- 0:interactive shell returns to top level on ${...?...} error
--?foo:1: 1: no arguments given
-+*>*foo:1: 1: no arguments given
- >reached
- 
-   print ${set1:+word1} ${set1+word2} ${null1:+word3} ${null1+word4}
diff --git a/debian/patches/series b/debian/patches/series
index ce4934a..857f0f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 further-mitigate-test-suite-hangs.patch
-cherry-pick-af2ab0247-attempt-to-make-output-from-interactive-test-more-robust.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git