up to 1.4.44

[packages/lighttpd.git] / branch.sh

diff --git a/branch.sh b/branch.sh
index 05e89e57cf43cb15c387ba8d203ff97d469e9246..72c2ffc8efbd45cd7797a6a03f1a9a7909ee9687 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 set -e
 svn=svn://svn.lighttpd.net/lighttpd
-url=https://github.com/lighttpd/lighttpd1.4
+url=https://git.lighttpd.net/lighttpd/lighttpd1.4.git
 package=lighttpd
-tag=lighttpd-1.4.40
+tag=lighttpd-1.4.42
 branch=master
-out=lighttpd-branch.diff
+out=$package-branch.diff
+repo=$package.git
 
 # old version of this code used to create tarball.
 # leave it around
@@ -23,17 +24,28 @@ d=$-
 filter() {
        set -$d
        # Excluding files which change version or were not in dist tarball
-       filterdiff \
+       filterdiff -p1 \
                -x 'CMakeLists.txt' \
                -x 'configure.ac' \
                -x 'SConstruct' \
+               -x 'packdist.sh' \
        | cat
 }
 
-echo >&2 "Running diff: $tag...$branch"
-LC_ALL=C curl -Ss $url/compare/$tag...$branch.patch > $out.tmp
+if [ ! -d $repo ]; then
+       git clone --bare $url -b $branch $repo
+fi
+
+cd $repo
+       git fetch origin +$branch:$branch +refs/tags/$tag:refs/tags/$tag
+       git log -p --reverse $tag..$branch | filter > ../$out.tmp
+cd ..
 
-filter < $out.tmp > $out.tmp2 && mv -f $out.{tmp2,tmp}
+if ! test -s $out.tmp; then
+       echo >&2 "No diffs..."
+       rm -f $out.tmp
+       exit 0
+fi
 
 if cmp -s $out{,.tmp}; then
        echo >&2 "No new diffs..."