From 5484e5d45f878c2f95f421b6468c8b70cf7ffed7 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Sat, 15 Sep 2018 02:57:51 +0200
Subject: Cherry-pick decc78c72 from upstream: _svn: Allow hyphens in command
 name aliases.

---
 ...72__svn:_Allow_hyphens_in_command_name_aliases.patch | 17 +++++++++++++++++
 debian/patches/series                                   |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 debian/patches/cherrypick_decc78c72__svn:_Allow_hyphens_in_command_name_aliases.patch

(limited to 'debian/patches')

diff --git a/debian/patches/cherrypick_decc78c72__svn:_Allow_hyphens_in_command_name_aliases.patch b/debian/patches/cherrypick_decc78c72__svn:_Allow_hyphens_in_command_name_aliases.patch
new file mode 100644
index 000000000..022c6db91
--- /dev/null
+++ b/debian/patches/cherrypick_decc78c72__svn:_Allow_hyphens_in_command_name_aliases.patch
@@ -0,0 +1,17 @@
+Origin: commit decc78c72110159bd8a27faf579c020abca6cb0b
+Author: Daniel Shahaf <d.s@daniel.shahaf.name>
+Date: Fri Sep 14 14:25:07 2018 +0000
+Description: _svn: Allow hyphens in command name aliases.
+ Used by svn 1.11.0-rc1.
+
+--- a/Completion/Unix/Command/_subversion
++++ b/Completion/Unix/Command/_subversion
+@@ -34,7 +34,7 @@
+     typeset -gHA _svn_cmds
+     if _cache_invalid svn-cmds || ! _retrieve_cache svn-cmds; then
+       _svn_cmds=(
+-	${=${(f)${${"$(_call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z-]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
++	${=${(f)${${"$(_call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z-]##)[[:space:]]#(\([a-z, ?-]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
+       )
+       if (( $? == 0 )); then
+         _store_cache svn-cmds _svn_cmds
diff --git a/debian/patches/series b/debian/patches/series
index cb6fdacc2..352a26952 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 further-mitigate-test-suite-hangs.patch
 update-debian-sections.patch
+cherrypick_decc78c72__svn:_Allow_hyphens_in_command_name_aliases.patch
-- 
cgit v1.2.3