diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-05-06 14:54:41 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-05-06 14:54:41 +0300 |
| commit | d09b586ecee2c178882c917546d6d6cb6600fa85 (patch) | |
| tree | f1e22c6e0fec2bf0a03115e1a497c0ec03ad3c29 /scripts | |
| parent | 888d34c55c15f244f0d68f82ae2c46fae24da630 (diff) | |
| download | vaadin-framework-d09b586ecee2c178882c917546d6d6cb6600fa85.tar.gz vaadin-framework-d09b586ecee2c178882c917546d6d6cb6600fa85.zip | |
Don't start merging if there are uncommitted changes
Change-Id: Ic1211e914162be6910caae10fcfc7deebc5b4ad3
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/automerge7.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh index 524b0ff912..ea83b2e52c 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 |