From 33e114bd3bb6e764e0e503a69c305ec4322aaa6a Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 23 Apr 2013 15:03:24 +0300
Subject: Ensure no-op merges get a change id

Change-Id: Icda1db985b3a0654fa1274e700cddfe2f990df12
---
 scripts/automerge7.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts/automerge7.sh')

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
-- 
cgit v1.2.3