aboutsummaryrefslogtreecommitdiffstats
path: root/util/git-hooks/pre-push
diff options
context:
space:
mode:
authorStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2016-11-27 17:45:49 +0100
committerDavid Hendricks <david.hendricks@gmail.com>2017-06-23 06:08:36 +0000
commit7634708c98a6fa439443e0791dd62563f4baf746 (patch)
treeab92caf9995bf2819ef31a8b4245a13c386027f9 /util/git-hooks/pre-push
parent8624e8cfa88ebd17ecf3bfd55c8dc1a799f47573 (diff)
downloadflashrom-7634708c98a6fa439443e0791dd62563f4baf746.tar.gz
flashrom-7634708c98a6fa439443e0791dd62563f4baf746.tar.bz2
flashrom-7634708c98a6fa439443e0791dd62563f4baf746.zip
Convert flashrom to git
- Drop support for Subversion in the getrevision script and Makefile. - Add .gitignore and .gitattributes file (the latter to limit exports). - Restore modification dates of the exported files from the SCM. - Stop exporting SCM log dumps to CHANGELOG. This makes no sense. - Do not export the pre-"compiled" manpage. It can be generated like anything else from the code dump when we export the respective variable. The latter is added with this change. - Add some initial client-side git hooks * When committing check for obvious stuff you never want anyway: - white space errors * When pushing to the upstream repository check mandatory rules: - existing signoffs and acks in all new commits - no deletions or creation of branches - do not rewrite history of the precious branches, even if forced NOTE: This patch is adapted from Stefan Tauner's original commit: https://mail.coreboot.org/pipermail/flashrom/2016-November/014877.html There are a few major differences: - This uses coreboot's commit-msg hook which includes support for generating and appending Change-Id. - djgpp-dos target removal is moved to a follow-up patch. - Version string changes are moved to a follow-up patch. Change-Id: I64eef21982cac0a0a7419bcd2c8a936672ae9cb2 Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Signed-off-by: David Hendricks <dhendricks@fb.com> Reviewed-on: https://review.coreboot.org/19206 Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'util/git-hooks/pre-push')
-rwxr-xr-xutil/git-hooks/pre-push74
1 files changed, 74 insertions, 0 deletions
diff --git a/util/git-hooks/pre-push b/util/git-hooks/pre-push
new file mode 100755
index 00000000..5bae8d26
--- /dev/null
+++ b/util/git-hooks/pre-push
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# A hook script to verify what is about to be pushed. Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed. If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+# <local ref> <local sha1> <remote ref> <remote sha1>
+
+remote="$1"
+url="$2"
+
+zero=0000000000000000000000000000000000000000
+
+upstream_pattern="github\.com.flashrom/flashrom(\.git)?|flashrom\.org.git/flashrom(\.git)?"
+precious_branches="stable staging"
+
+# Only care about the upstream repository
+if echo "$url" | grep -q -v -E "$upstream_pattern" ; then
+ exit 0
+fi
+
+while read local_ref local_sha remote_ref remote_sha ; do
+ if [ "$remote_ref" != "refs/heads/staging" -a "$remote_ref" != "refs/heads/stable" ]; then
+ echo "Feature branches not allowed ($remote_ref)." >&2
+ exit 1
+ fi
+
+ if [ "$local_sha" = $zero ]; then
+ echo "Deletion of branches is prohibited." >&2
+ exit 1
+ fi
+
+ if [ "$remote_sha" = "$zero" ]; then
+ echo "No new branches allowed." >&2
+ exit 1
+ fi
+
+ # Check for Signed-off-by and Acked-by
+ commit=$(git rev-list -n 1 --all-match --invert-grep -E \
+ --grep '^Signed-off-by: .+ <.+@.+\..+>$' --grep '^Acked-by: .+ <.+@.+\..+>$' \
+ "$remote_sha..$local_sha")
+ if [ -n "$commit" ]; then
+ echo "Commit $local_sha in $local_ref is missing either \"Signed-off-by\"" \
+ " or \"Acked-by\" lines, not pushing." >&2
+ exit 1
+ fi
+
+ # Make _really_ sure we do not rewrite precious history
+ for lbranch in $precious_branches ; do
+ if [ "$remote_ref" = "refs/heads/$lbranch" ]; then
+ nonreachable=$(git rev-list $remote_sha ^$local_sha | head -1)
+ if [ -n "$nonreachable" ]; then
+ echo "Only fast-forward pushes are allowed on $lbranch." >&2
+ echo "$nonreachable is not included in $remote_sha while pushing to $remote_ref" >&2
+ exit 1
+ fi
+ fi
+ done
+
+ # FIXME: check commit log format (subject without full stop at the end etc).
+ # FIXME: do buildbot checks if authorized?
+done
+
+exit 0