Merge branch 'ps-build' into ps-2.4-stable

erthink · Apr 7, 2015 · 3b35a2f · 3b35a2f
2 parents c97fa0a + f64ff6c
commit 3b35a2f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 \