Commit b966ceb4 authored by Brad King's avatar Brad King
Browse files

prepare-commit-msg: Add Gerrit Change-Id to merges

The "git merge" command generates its own commit message and does not
invoke the commit-msg hook.  Fortunately it invokes prepare-commit-msg
so teach it to call the gerrit/commit-msg hook for merges.
Suggested-by: Chris Harris's avatarChris Harris <>
parent ad08c209
#!/usr/bin/env bash
# Copyright 2010-2011 Kitware, Inc.
# Copyright 2010-2012 Kitware, Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......@@ -17,6 +17,14 @@
. "$GIT_DIR/hooks/hooks-config.bash"
# Invoke the Gerrit Change-Id hook here for "git merge" because
# it does not run the normal commit-msg hook.
hooks_GerritId=$(git config --get hooks.GerritId)
case "$hooks_GerritId,$2,$3" in
true,merge,) "$GIT_DIR/hooks/gerrit/commit-msg" "$1" ;;
*) ;;
# Chain to project-specific hook.
. "$GIT_DIR/hooks/hooks-chain.bash"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment