summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-02-16 18:50:02 +0100
committerJan Tojnar <jtojnar@gmail.com>2022-02-21 19:12:35 +0100
commit3cce255fc1598ce9c7d0c871dbd6dbcd4271e211 (patch)
treef4a53b3c9c4e65324cedcdc4c7d56e084b57a5a8 /maintainers
parent29ad20e6f9bff2c8c8a016228176f21c9c399bae (diff)
downloadnixpkgs-3cce255fc1598ce9c7d0c871dbd6dbcd4271e211.tar
nixpkgs-3cce255fc1598ce9c7d0c871dbd6dbcd4271e211.tar.gz
nixpkgs-3cce255fc1598ce9c7d0c871dbd6dbcd4271e211.tar.bz2
nixpkgs-3cce255fc1598ce9c7d0c871dbd6dbcd4271e211.tar.lz
nixpkgs-3cce255fc1598ce9c7d0c871dbd6dbcd4271e211.tar.xz
nixpkgs-3cce255fc1598ce9c7d0c871dbd6dbcd4271e211.tar.zst
nixpkgs-3cce255fc1598ce9c7d0c871dbd6dbcd4271e211.zip
maintainers/scripts/update.nix: Add experimental support for customizing commit message
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/scripts/update.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py
index 06b12a0ee04..07e0b5c6830 100644
--- a/maintainers/scripts/update.py
+++ b/maintainers/scripts/update.py
@@ -88,6 +88,10 @@ async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, bra
         async with merge_lock:
             await check_subprocess('git', 'add', *change['files'], cwd=worktree)
             commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change)
+            if 'commitMessage' in change:
+                commit_message = change['commitMessage']
+            elif 'commitBody' in change:
+                commit_message = commit_message + '\n\n' + change['commitBody']
             await check_subprocess('git', 'commit', '--quiet', '-m', commit_message, cwd=worktree)
             await check_subprocess('git', 'cherry-pick', branch)