From c2a07b277bdf12fa7c4f10538c88b689d907d49c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 2 Sep 2016 00:12:06 +0300 Subject: [PATCH] use master branch for diff --- branch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/branch.sh b/branch.sh index 18b1adf..669da04 100755 --- a/branch.sh +++ b/branch.sh @@ -3,8 +3,8 @@ set -e svn=svn://svn.lighttpd.net/lighttpd url=https://git.lighttpd.net/lighttpd/lighttpd1.4.git package=lighttpd -tag=lighttpd-1.4.40 -branch=personal/gstrauss/master +tag=lighttpd-1.4.41 +branch=master out=$package-branch.diff repo=$package.git @@ -37,7 +37,7 @@ if [ ! -d $repo ]; then fi cd $repo - git fetch origin +$branch:$branch +refs/tags/$tag:refs/tags/$tag + git fetch origin +$branch:refs/remotes/origin/$branch +refs/tags/$tag:refs/tags/$tag git log -p --reverse $tag..$branch | filter > ../$out.tmp cd .. -- 2.44.0