mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
653f8b711b
In older versions of Gerrit the Change-Id field was inserted at the start of the trailers. Commit 68296f71804feab2e0ae18ae33f834a8a41621e4 simplified the trailers code by using git trailers instead of custom code but now inserts Change-Id at the end of the trailers section. A consequence of this is that folks who sign-off their commits using `git commit -s` now has the sign-off appear first followed by Change-Id. If the user then runs `git commit -s --amend` to update the change because the Sign-off-by line is not last, git inserts a 2nd duplicate Signed-off-by line. This patch simply restores the previous behaviour of the Gerrit commit-msg hook where Change-Id would be inserted before the Sign-off-by line to avoid this issue. Backported from [1] by Thanh Ha. [1] https://gerrit-review.googlesource.com/c/gerrit/+/262072 Bug: https://crbug.com/12546 Change-Id: I1406c763a3935761247f6771f55e02367f698e6e Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/262352 Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: David Pursehouse <dpursehouse@collab.net>
64 lines
1.8 KiB
Bash
Executable File
64 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
# From Gerrit Code Review 3.1.3
|
|
#
|
|
# Part of Gerrit Code Review (https://www.gerritcodereview.com/)
|
|
#
|
|
# Copyright (C) 2009 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# avoid [[ which is not POSIX sh.
|
|
if test "$#" != 1 ; then
|
|
echo "$0 requires an argument."
|
|
exit 1
|
|
fi
|
|
|
|
if test ! -f "$1" ; then
|
|
echo "file does not exist: $1"
|
|
exit 1
|
|
fi
|
|
|
|
# Do not create a change id if requested
|
|
if test "false" = "`git config --bool --get gerrit.createChangeId`" ; then
|
|
exit 0
|
|
fi
|
|
|
|
# $RANDOM will be undefined if not using bash, so don't use set -u
|
|
random=$( (whoami ; hostname ; date; cat $1 ; echo $RANDOM) | git hash-object --stdin)
|
|
dest="$1.tmp.${random}"
|
|
|
|
trap 'rm -f "${dest}"' EXIT
|
|
|
|
if ! git stripspace --strip-comments < "$1" > "${dest}" ; then
|
|
echo "cannot strip comments from $1"
|
|
exit 1
|
|
fi
|
|
|
|
if test ! -s "${dest}" ; then
|
|
echo "file is empty: $1"
|
|
exit 1
|
|
fi
|
|
|
|
# Avoid the --in-place option which only appeared in Git 2.8
|
|
# Avoid the --if-exists option which only appeared in Git 2.15
|
|
if ! git -c trailer.ifexists=doNothing interpret-trailers --where start \
|
|
--trailer "Change-Id: I${random}" < "$1" > "${dest}" ; then
|
|
echo "cannot insert change-id line in $1"
|
|
exit 1
|
|
fi
|
|
|
|
if ! mv "${dest}" "$1" ; then
|
|
echo "cannot mv ${dest} to $1"
|
|
exit 1
|
|
fi
|