Gerrit 代码提交缺少 Change-Id

713 阅读1分钟

项目采用 gerrit 作为代码审查后,第一次提交代码会出现缺少 Change-Id 的情况

commit 7aafa31: missing Change-Id in message footer

Total 13 (delta 6), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas:  16% (1/6)           
remote: Resolving deltas:  33% (2/6)           
remote: Resolving deltas:  50% (3/6)           
remote: Resolving deltas:  66% (4/6)           
remote: Resolving deltas:  83% (5/6)           
remote: Resolving deltas: 100% (6/6)           
remote: Resolving deltas: 100% (6/6)        
remote: Counting objects: 71           
remote: Counting objects: 12302           
remote: Counting objects: 18150, done        
remote: 
remote: Processing changes: refs: 1        
remote: Processing changes: refs: 1        
remote: Processing changes: refs: 1, done            
remote: ERROR: commit 7aafa31: missing Change-Id in message footer        
remote: 
remote: Hint: to automatically insert a Change-Id, install the hook:        
remote:   gitdir=$(git rev-parse --git-dir); scp -p -P 29418 hedong_hj@gerrit.auto-link.com.cn:hooks/commit-msg ${gitdir}/hooks/        
remote: or, for http(s):        
remote:   f="$(git rev-parse --git-dir)/hooks/commit-msg"; curl -o "$f" http://gerrit.auto-link.com.cn:8085/tools/hooks/commit-msg ; chmod +x "$f"        
remote: and then amend the commit:        
remote:   git commit --amend --no-edit        
remote: Finally, push your changes again        
remote: 
error: failed to push some refs to 'ssh://gerrit.auto-link.com.cn:29418/Projects/AutoLinkOS/platform/packages/apps/VehicleSettings'
To ssh://gerrit.auto-link.com.cn:29418/Projects/AutoLinkOS/platform/packages/apps/VehicleSettings
!	refs/heads/al_chery_dev_1.5_t1p_int:refs/for/al_chery_dev_1.5_t1p_int	[remote rejected] (commit 7aafa31: missing Change-Id in message footer)
Done

根据提示需要安装一个钩子,自动添加 change-id 的。

Hint: to automatically insert a Change-Id, install the hook:

在终端中执行:

# 第一步
gitdir=$(git rev-parse --git-dir); scp -p -P 29418 hedong_hj@gerrit.auto-link.com.cn:hooks/commit-msg ${gitdir}/hooks/
# 第二步
git commit --amend --no-edit

这个时候应该是可以自动生成 Change-Id了,

终极方案

如果还是提示没有 Change-Id,把这个模板 Copy 到该路径下:

  • 在 Git 仓库中,通常会有一个名为 commit-msg 的样板钩子模板。这个模板通常位于 .git/hooks/ 目录下
  • 复制 commit-msg 钩子模板到同一目录下,并将其命名为 commit-msg(没有扩展名)。

模板代码:

#!/bin/sh
# From Gerrit Code Review 3.5.2
#
# 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.

set -u

# 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

if git rev-parse --verify HEAD >/dev/null 2>&1; then
  refhash="$(git rev-parse HEAD)"
else
  refhash="$(git hash-object -t tree /dev/null)"
fi

random=$({ git var GIT_COMMITTER_IDENT ; echo "$refhash" ; cat "$1"; } | 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

reviewurl="$(git config --get gerrit.reviewUrl)"
if test -n "${reviewurl}" ; then
  if ! git interpret-trailers --parse < "$1" | grep -q '^Link:.*/id/I[0-9a-f]\{40\}$' ; then
    if ! git interpret-trailers \
          --trailer "Link: ${reviewurl%/}/id/I${random}" < "$1" > "${dest}" ; then
      echo "cannot insert link footer in $1"
      exit 1
    fi
  fi
else
  # 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 \
        --trailer "Change-Id: I${random}" < "$1" > "${dest}" ; then
    echo "cannot insert change-id line in $1"
    exit 1
  fi
fi

if ! mv "${dest}" "$1" ; then
  echo "cannot mv ${dest} to $1"
  exit 1
fi