]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-tag: Provide a message when merging
authorDavid Galloway <dgallowa@redhat.com>
Wed, 18 May 2022 21:25:38 +0000 (17:25 -0400)
committerDavid Galloway <dgallowa@redhat.com>
Wed, 18 May 2022 21:25:38 +0000 (17:25 -0400)
Signed-off-by: David Galloway <dgallowa@redhat.com>
ansible/roles/ceph-release/tasks/push.yml

index a14b584fa430baebda4501640981f216df9a68c3..023fc13f4f070185f4109b48854128b0272d714f 100644 (file)
@@ -48,7 +48,7 @@
 
 # In case any commits got pushed to {{ branch }} while we were building
 - name: "merge {{ branch }}-release changes back into {{ branch }}"
-  command: git merge {{ branch }}-release
+  command: git merge -m "Merging {{ branch }}-release {{ version }} commit into {{ branch }}" {{ branch }}-release
   args:
     chdir: ceph