Rel 14; fix segfault in srs

[packages/exim.git] / branch.sh

diff --git a/branch.sh b/branch.sh
index bd105ec72277fe05198daa1cf4978d37b061432b..974805253e60660365f94473b8b7abdd57786653 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -2,14 +2,19 @@
 set -e
 url=git://git.exim.org/exim.git
 package=exim
-tag=exim-4.92.1
-branch=exim-4.92.1+fixes
+tag=exim-4.97
+#branch=exim-4.97+fixes
+branch=master
 out=$package-git.patch
 repo=$package.git
 
 # use filterdiff, etc to exclude bad chunks from diff
 filter() {
-       cat
+    filterdiff \
+        -x '*/Readme.pod' \
+        -x '*/test/*' \
+        -x '*/doc/*' \
+        -x '*/release-process/*'
 }
 
 if [ ! -d $repo ]; then
@@ -18,7 +23,7 @@ fi
 
 cd $repo
        git fetch origin +$branch:$branch +refs/tags/$tag:refs/tags/$tag
-       git log -p --reverse $tag..$branch ":(exclude)doc/doc-*" ":(exclude)test" ":(exclude).*" | filter > ../$out.tmp
+       git log -p --reverse --first-parent $tag..$branch ":(exclude)doc/doc-*" ":(exclude)test" ":(exclude).*" | filter > ../$out.tmp
 cd ..
 
 if cmp -s $out{,.tmp}; then