summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir@cohens.org.il>2011-05-17 10:25:12 +0300
committerTzafrir Cohen <tzafrir@cohens.org.il>2011-05-17 10:25:12 +0300
commit6a3dee5729dd232387ffc3d40d29bab9022d71aa (patch)
tree3851f863d9ed400ab6d4b7ac68149c9408206587
parentc7591e46929042c01dcbb2e7ed240578c77bfe02 (diff)
format_patch_dep3: also support origsvn
-rwxr-xr-xformat_patch_dep37
1 files changed, 4 insertions, 3 deletions
diff --git a/format_patch_dep3 b/format_patch_dep3
index bd3e7ff..3dd40f2 100755
--- a/format_patch_dep3
+++ b/format_patch_dep3
@@ -52,9 +52,10 @@ fi
# FIXME: ^' *' makes it work with 'git show', but increases the chance of
# it changing the actual patch.
get_patch \
-| sed \
- -e 's|^ *git-svn-id: http://svn.asterisk.org/[^@]*@\([0-9]\+\) .*|Origin: http://svnview.digium.com/svn/asterisk?view=rev\&rev=\1|' \
- -e 's|^ *(issue #\([0-9]\+\))$|Bug: https://issues.asterisk.org/view.php?id=\1|i' \
+| sed -r \
+ -e 's#^ *git-svn-id: (http://svn.asterisk.org|https://origsvn.digium.com)/[^@]*@([0-9]+) .*#Origin: http://svnview.digium.com/svn/asterisk?view=rev\&rev=\2#' \
+ -e 's@^ *\((|closes )issue #([0-9]+)\)$@Bug: https://issues.asterisk.org/view.php?id=\2@i' \
#git-svn-id: git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/1.4@233609
#(issue #16299)
+#(closes issue #16299)