diff --git a/ps-build.sh b/ps-build.sh index 97950a1881..4770dd5dba 100755 --- a/ps-build.sh +++ b/ps-build.sh @@ -58,7 +58,7 @@ PACKAGE="$(grep VERSION= Makefile | cut -d ' ' -f 2).${BUILD_NUMBER}" echo "PACKAGE: $PACKAGE" mkdir -p ${PREFIX}/bin \ - && (git log --date=short --pretty=format:"%ad %s" $(git describe --always --abbrev=0 --tags).. \ + && (git log --no-merges --date=short --pretty=format:"%ad %s" $(git describe --always --abbrev=0 --tags).. \ | sed 's/lmdb-backend/slapd/g;s/EXTENSION/[+]/g;s/BUGFIX/[-] /g;s/FEATURE/[+]/g;s/CHANGE/[!]/g;s/TRIVIA/[*]/g;s/ - / /g' \ | tr -s ' ' ' ' | grep -v ' ITS#[0-9]\{4\}$' | sort -r | uniq -u \ && /bin/echo -e "\nPackage version: $PACKAGE\nSource code tag: $(git describe --abbrev=15 --long --always --tags)" ) > ${PREFIX}/changelog.txt \