[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.10.1-4-37-g03befb1

Mirco Bauer meebey at meebey.net
Sun Aug 7 16:05:20 UTC 2011


The following commit has been merged in the master-experimental branch:
commit 6cb63b3de34edf86233a2b8d05c2ae4571237ea1
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Aug 7 17:53:53 2011 +0200

    Use debian-branch instead of current branch

diff --git a/debian/git-merge-debian-patches b/debian/git-merge-debian-patches
index f8d17f6..e896328 100755
--- a/debian/git-merge-debian-patches
+++ b/debian/git-merge-debian-patches
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-DEBIAN_PATCHES=$(git branch -l | egrep '\s+debian/patches/')
+CURRENT_BRANCH=$(git branch -l | egrep '^\* ' | cut -d ' ' -f 2)
+DEBIAN_BRANCH=$(grep -h ^debian-branch $(git rev-parse --show-cdup)./debian/gbp.conf ~/.gbp.conf 2> /dev/null | head -n 1 | cut -d '=' -f 2)
+DEBIAN_PATCHES=$(git branch -l | egrep "$DEBIAN_BRANCH-patches/")
 for DEBIAN_PATCH in $DEBIAN_PATCHES; do
 	git merge --no-ff $DEBIAN_PATCH
 done 

-- 
mono



More information about the Pkg-mono-svn-commits mailing list