summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-04-15 06:55:13 +0000
committerMike Frysinger <vapier@google.com>2020-04-15 07:17:16 +0000
commit1122353683fa5e8a4e2236d4b607310e57a0476a (patch)
tree84146fea7274affad126013b53e2bf0b27e4b132
parentb6871899be405178e8557fd9097918143532dd8f (diff)
downloadgit-repo-1122353683fa5e8a4e2236d4b607310e57a0476a.tar.gz
Revert "commit-msg: Insert Change-Id at start of trailers"
This reverts commit 653f8b711be3344e8c617512629270661b24fa86. Reason for revert: This requires git-2.15 which is much newer than repo itself requires. Lets pull it until we can figure out something on the Gerrit side. Bug: https://crbug.com/gerrit/12546 Change-Id: I5148f8a9cab5f0c305c020e31627b4af88cd5c95 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/263012 Reviewed-by: David Pursehouse <dpursehouse@collab.net> Tested-by: Mike Frysinger <vapier@google.com>
-rwxr-xr-xhooks/commit-msg2
1 files changed, 1 insertions, 1 deletions
diff --git a/hooks/commit-msg b/hooks/commit-msg
index 92fdc545..70d67eaf 100755
--- a/hooks/commit-msg
+++ b/hooks/commit-msg
@@ -51,7 +51,7 @@ fi
51 51
52# Avoid the --in-place option which only appeared in Git 2.8 52# Avoid the --in-place option which only appeared in Git 2.8
53# Avoid the --if-exists option which only appeared in Git 2.15 53# Avoid the --if-exists option which only appeared in Git 2.15
54if ! git -c trailer.ifexists=doNothing interpret-trailers --where start \ 54if ! git -c trailer.ifexists=doNothing interpret-trailers \
55 --trailer "Change-Id: I${random}" < "$1" > "${dest}" ; then 55 --trailer "Change-Id: I${random}" < "$1" > "${dest}" ; then
56 echo "cannot insert change-id line in $1" 56 echo "cannot insert change-id line in $1"
57 exit 1 57 exit 1