diff options
| author | Artur Signell <artur@vaadin.com> | 2013-04-23 15:03:24 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-04-23 12:38:15 +0000 |
| commit | 33e114bd3bb6e764e0e503a69c305ec4322aaa6a (patch) | |
| tree | ec7537a73a3434b6a93c87d1dd4d44d5361ddc81 /scripts | |
| parent | ed79188e0dd8876496c9848ca40479256e08c6c3 (diff) | |
| download | vaadin-framework-33e114bd3bb6e764e0e503a69c305ec4322aaa6a.tar.gz vaadin-framework-33e114bd3bb6e764e0e503a69c305ec4322aaa6a.zip | |
Ensure no-op merges get a change id
Change-Id: Icda1db985b3a0654fa1274e700cddfe2f990df12
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/automerge7.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh index 8f8ed9a785..d64f98a185 100755 --- a/scripts/automerge7.sh +++ b/scripts/automerge7.sh @@ -76,9 +76,12 @@ do maybe_commit_and_push $pendingCommit pendingCommit= echo - echo "Doing a no-op merge for $commit because of Merge: no" + echo "Doing a no-op merge because of Merge: no for $commit" + git log -n 1 --format=%B $commit + echo # Do a no-op merge git merge $commit -s ours + git commit --amend --no-edit pushMerged elif [ "$mergeDirective" == "manual" ] then |