[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-4-34-gd1bf954

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit d06b9ada2ce94f8dab4635661b02536272845977
Author: Mirco Bauer <meebey at meebey.net>
Date:   Tue Aug 3 01:10:44 2010 +0200

    Only merge branches that really begin with debian/patches/*

diff --git a/debian/git-merge-debian-patches b/debian/git-merge-debian-patches
index b77ac60..f8d17f6 100755
--- a/debian/git-merge-debian-patches
+++ b/debian/git-merge-debian-patches
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEBIAN_PATCHES=$(git branch -l | grep debian/patches/)
+DEBIAN_PATCHES=$(git branch -l | egrep '\s+debian/patches/')
 for DEBIAN_PATCH in $DEBIAN_PATCHES; do
 	git merge --no-ff $DEBIAN_PATCH
 done 

-- 
mono