summaryrefslogtreecommitdiffstats
path: root/util/git-hooks/commit-msg
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2017-11-03 18:22:39 +0100
committerNico Huber <nico.h@gmx.de>2017-12-09 23:12:33 +0000
commit0bfa8198ae2d2e13fbab320ec28a455f401121f1 (patch)
tree99b33b9afae462a812fa9d05eaa90e0fc67b412f /util/git-hooks/commit-msg
parent22f2dc5ec0b13a413a9ce42a5836ec2aa3b1abfc (diff)
downloadflashrom-0bfa8198ae2d2e13fbab320ec28a455f401121f1.tar.gz
flashrom-0bfa8198ae2d2e13fbab320ec28a455f401121f1.tar.bz2
flashrom-0bfa8198ae2d2e13fbab320ec28a455f401121f1.zip
Prepare for a single branch on gerritstaging
Discourage all direct pushes to the upstream repositories, no matter the branch. Also, skip adding Change-Ids to fixup! and squash! commits. Change-Id: I13aa478edd200ce85da86962e4f94f7ac446b05f Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/22330 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'util/git-hooks/commit-msg')
-rwxr-xr-xutil/git-hooks/commit-msg9
1 files changed, 4 insertions, 5 deletions
diff --git a/util/git-hooks/commit-msg b/util/git-hooks/commit-msg
index b9217e081..811cceddf 100755
--- a/util/git-hooks/commit-msg
+++ b/util/git-hooks/commit-msg
@@ -44,11 +44,10 @@ add_ChangeId() {
return
fi
- # *Do* add Change-Id to temp commits (original code bails out here)
- # if echo "$clean_message" | head -1 | grep -q '^\(fixup\|squash\)!'
- # then
- # return
- # fi
+ if echo "$clean_message" | head -1 | grep -q '^\(fixup\|squash\)!'
+ then
+ return
+ fi
if test "false" = "`git config --bool --get gerrit.createChangeId`"
then