Merge remote-tracking branch 'origin/master'

1 files changed, 12 insertions, 5 deletions

diff --git a/scripts/merge-check.sh b/scripts/merge-check.sh
index 0debea8b40..ef52cd44f4 100755
--- a/scripts/merge-check.sh
+++ b/scripts/merge-check.sh
@@ -8,6 +8,9 @@ then
 	exit 3
 fi
 
+testname="merge check for `pwd|sed "s/.*\///"`"
+echo "##teamcity[testStarted name='$testname' captureStandardOutput='true']"
+
 command="git --no-pager log --no-color $SINCE..$UNTIL"
 # TODO Why do I get whitespace in the beginning of the wc output?
 change_count=`$command --oneline|wc -l|tr -d ' '`
@@ -15,10 +18,14 @@ change_count=`$command --oneline|wc -l|tr -d ' '`
 if [ "$change_count" = "0" ]
 then
 	echo "No unmerged commits"
-	exit 0
+else 
+	command="$command --format=short"
+	message="There are $change_count commits that have not been merged from $UNTIL to $SINCE"
+	echo $message
+	echo ""
+	$command
+	details=`$command|perl -p -e 's/\n/|n/' | sed "s/['\|\[\]]/|\&/g"`
+	echo "##teamcity[testFailed name='$testname' message='$message' details='|n$details']"
 fi
 
-echo "There are $change_count commits that have not been merged from $UNTIL to $SINCE: "
-echo ""
-$command
-exit 1
\ No newline at end of file
+echo "##teamcity[testFinished name='$testname']"