X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=branch.sh;h=d5c1f97f2065754d50213201eed08f0c8f4efcd0;hb=HEAD;hp=4dbf809cbc36a83014cd90866a1d75c0af642e09;hpb=acfdf00573a9a2dde4c8239a3d1cd02e20e9c7d6;p=packages%2Fexim.git diff --git a/branch.sh b/branch.sh index 4dbf809..9748052 100755 --- a/branch.sh +++ b/branch.sh @@ -2,14 +2,19 @@ set -e url=git://git.exim.org/exim.git package=exim -tag=exim-4_89 -branch=exim-4_89+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