From 7af5e29c321acf2ec3c649c69ab23a936358b9f8 Mon Sep 17 00:00:00 2001 From: Dan Wells Date: Thu, 16 Jan 2014 15:07:40 -0500 Subject: [PATCH] Changes to smooth out make_release 1) Make the fake 'HeadURL' into a URL which works with our web repo. Note that this has 'tags/' hardcoded in, so it only works with true release branches (e.g. rel_x_y_z) not "working" branches (e.g. rel_x_y). 2) Change range selector when building log to better exclude commits from previous releases. Signed-off-by: Dan Wells Signed-off-by: Bill Erickson --- build/tools/make_release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tools/make_release b/build/tools/make_release index 4fb990ca24..1cb3d7a432 100755 --- a/build/tools/make_release +++ b/build/tools/make_release @@ -2,7 +2,7 @@ GIT_ABS=`git rev-parse --show-toplevel` GIT_BRANCH=`git rev-parse --abbrev-ref HEAD | sed 's|.*/||'` -HEADURLBASE="http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/" +HEADURLBASE="http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/" HEADURL="$HEADURLBASE$GIT_BRANCH" # Drop to the root of the checkout @@ -277,7 +277,7 @@ if [ $PREV_BRANCH != "PACKAGE" ]; then grep -i -m 1 Signed-off-by ChangeLog &> /dev/null if [ $? -ne 0 ]; then echo "Building ChangeLog" - git log --cherry-pick --right-only --no-merges --pretty --summary --numstat $PREV_BRANCH..HEAD > $GIT_ABS/ChangeLog + git log --cherry-pick --right-only --no-merges --pretty --summary --numstat $PREV_BRANCH...HEAD > $GIT_ABS/ChangeLog else echo "Not overwriting existing ChangeLog!" fi -- 2.43.2