Merge changes from origin/7.1

7d9f544 Test for #11396 (merged from 6.8 branch). Depends on a blur event so cannot be autotested with TB.
d09b586 Don't start merging if there are uncommitted changes
5388dce Fixed IllegalSyntaxException when using spaces in path #11782
96b6250 Form field and layout Aria corrections (#11785)
9bd7c2b Fixed order of tests in LayoutTesterApplication #11796
f2c2236 Replaced css inject hack in TestUtils with Page.Styles.add() #11798
571792e Remove old widget hierarchy hack that caused problems (#11752)
1b18807 Remove pre-loader element after pre-loading, fixes #10863
e285119 Move .v-assistive-device-only out of @mixin base-common
762c924 Update test to work with the new debug window
ce9c818 Instead of applying workaround to the root panel, apply it to the sub window content element instead to prevent scrolling of the document when a sub window is removed. #11713 (#10776)
3f5d022 Liferay 6.2 compatibility (#11751)
ffd1c1b Don't ignore child component margins in AbstractOrderedLayout (#11553)
62ae5e1 More verbose output from running Jetty
21d9b67 Add a large number of debug calls to VFilterSelect (disabled by default)
bdb7931 Merge test for #11623 to 7.0.
19e27a1 Move suggestion popup width calculation from connector to VFilterSelect
42d9476 Merge changes from origin/7.0

Change-Id: I2c02268adcb7c81bd7f0c465be152c1d88293532

1 files changed, 8 insertions, 0 deletions

diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh
index 8d2cfb5cb8..564296f5db 100755
--- a/scripts/automerge7.sh
+++ b/scripts/automerge7.sh
@@ -67,6 +67,14 @@ maybe_commit_and_push() {
         pushMerged
 }
 
+nothingToCommit=`git status | grep "nothing to commit"`
+if [ "$nothingToCommit" == "" ]
+then
+	git status
+	echo "Can not merge when there are unstaged changes."
+	exit 1;
+fi 
+
 git checkout $TO
 git fetch