Merge branch 'nd/list-merge-strategy'

diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh
index 8757b3a97c5d7598bfdb2ec1f42cbb6851bae448..d99a180e528084a43dff3f640ad3036f4f9dbf07 100755 (executable)
--- a/ci/run-windows-build.sh
+++ b/ci/run-windows-build.sh
@@ -69,6 +69,10 @@ esac
 
 echo "Visual Studio Team Services Build #${BUILD_ID}"
 
+# Tracing execued commands would produce too much noise in the waiting
+# loop below.
+set +x
+
 # Wait until build job finished
 STATUS=
 RESULT=
@@ -90,7 +94,10 @@ done
 # Print log
 echo ""
 echo ""
+set -x
 gfwci "action=log&buildId=$BUILD_ID" | cut -c 30-
 
 # Set exit code for TravisCI
 test "$RESULT" = "success"
+
+save_good_tree