[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.7-2-5-ga053cc7

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit a16f93ab0c7ebbde4dc31e88ad99d4d5845bafaf
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue Aug 31 14:22:35 2010 +0100

    Add --no-ext-diff to git diff call of git-test-debian-patches
    
    The script expects the output to be in diff(1) format.

diff --git a/debian/git-test-debian-patches b/debian/git-test-debian-patches
index 200d902..76f3126 100755
--- a/debian/git-test-debian-patches
+++ b/debian/git-test-debian-patches
@@ -32,7 +32,7 @@ for DEBIAN_PATCH in $DEBIAN_PATCHES; do
         if [ $? != 0 ]; then
                 echo "ERROR: Test merge of $DEBIAN_PATCH failed, branch needs update!"
         else
-                DELTA=$(git diff HEAD | wc -l)
+                DELTA=$(git diff --no-ext-diff HEAD | wc -l)
                 if [ $DELTA = 0 ]; then
                         echo "WARNING: delta of $DEBIAN_PATCH is 0! Patch already applied upstream, drop branch!"
                 fi

-- 
mono