首页 > 代码库 > gerrit的git配置流程
gerrit的git配置流程
1、配置环境变量
配置git全局用户名
git config --global user.name "qujunorz" git config --global user.email "qujunorz@gmail.com" #gerrit中注册的用户名与邮箱
修改.git/config
[remote "gerrit"] url = ssh://qujunorz@$代码url地址 fetch = +refs/heads/*:refs/remotes/gerrit/*
创建.git/hooks中的commit-msg文件
#为了避免错误“remote: ERROR: missing Change-Id in commit message footer”
#!/bin/sh # From Gerrit Code Review 2.7 # # Part of Gerrit Code Review ( # # 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 # # # # 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.#unset GREP_OPTIONS CHANGE_ID_AFTER="Bug|Issue"MSG="$1" # Check for, and add if missing, a unique Change-Id # add_ChangeId() { clean_message=`sed -e ‘ /^diff --git a\/.*/{ s/// q } /^Signed-off-by:/d /^#/d ‘ "$MSG" | git stripspace` if test -z "$clean_message" then return fi # Does Change-Id: already exist? if so, exit (no change). if grep -i ‘^Change-Id:‘ "$MSG" >/dev/null then return fi id=`_gen_ChangeId` T="$MSG.tmp.$$" AWK=awk if [ -x /usr/xpg4/bin/awk ]; then # Solaris AWK is just too broken AWK=/usr/xpg4/bin/awk fi # How this works: # - parse the commit message as (textLine+ blankLine*)* # - assume textLine+ to be a footer until proven otherwise # - exception: the first block is not footer (as it is the title) # - read textLine+ into a variable # - then count blankLines # - once the next textLine appears, print textLine+ blankLine* as these # aren‘t footer # - in END, the last textLine+ block is available for footer parsing $AWK ‘ BEGIN { # while we start with the assumption that textLine+ # is a footer, the first block is not. isFooter = 0 footerComment = 0 blankLines = 0 } # Skip lines starting with "#" without any spaces before it. /^#/ { next } # Skip the line starting with the diff command and everything after it, # up to the end of the file, assuming it is only patch data. # If more than one line before the diff was empty, strip all but one. /^diff --git a/ { blankLines = 0 while (getline) { } next } # Count blank lines outside footer comments /^$/ && (footerComment == 0) { blankLines++ next } # Catch footer comment /^\[[a-zA-Z0-9-]+:/ && (isFooter == 1) { footerComment = 1 } /]$/ && (footerComment == 1) { footerComment = 2 } # We have a non-blank line after blank lines. Handle this. (blankLines > 0) { print lines for (i = 0; i < blankLines; i++) { print "" } lines = "" blankLines = 0 isFooter = 1 footerComment = 0 } # Detect that the current block is not the footer (footerComment == 0) && (!/^\[?[a-zA-Z0-9-]+:/ || /^[a-zA-Z0-9-]+:\/\//) { isFooter = 0 } { # We need this information about the current last comment line if (footerComment == 2) { footerComment = 0 } if (lines != "") { lines = lines "\n"; } lines = lines $0 } # Footer handling: # If the last block is considered a footer, splice in the Change-Id at the # right place. # Look for the right place to inject Change-Id by considering # CHANGE_ID_AFTER. Keys listed in it (case insensitive) come first, # then Change-Id, then everything else (eg. Signed-off-by:). # # Otherwise just print the last block, a new line and the Change-Id as a # block of its own. END { unprinted = 1 if (isFooter == 0) { print lines "\n" lines = "" } changeIdAfter = "^(" tolower("‘"$CHANGE_ID_AFTER"‘") "):" numlines = split(lines, footer, "\n") for (line = 1; line <= numlines; line++) { if (unprinted && match(tolower(footer[line]), changeIdAfter) != 1) { unprinted = 0 print "Change-Id: I‘"$id"‘" } print footer[line] } if (unprinted) { print "Change-Id: I‘"$id"‘" } }‘ "$MSG" > "$T" && mv "$T" "$MSG" || rm -f "$T"}_gen_ChangeIdInput() { echo "tree `git write-tree`" if parent=`git rev-parse "HEAD^0" 2>/dev/null` then echo "parent $parent" fi echo "author `git var GIT_AUTHOR_IDENT`" echo "committer `git var GIT_COMMITTER_IDENT`" echo printf ‘%s‘ "$clean_message"}_gen_ChangeId() { _gen_ChangeIdInput | git hash-object -t commit --stdin } add_ChangeId
修改ssh_config
KexAlgorithms +diffie-hellman-group1-sha1
上传ssh公钥至服务器
2、代码上传操作
克隆代码到本地
git clone $代码在gerrit中地址
新建一个分支
git branch -a #列出本地或远程的所有分支 git branch -r #列出远程分支 git branch [branch_name] ## 新建分支
切换到分支
git checkout [branch_name] 或者不使用git branch新建,直接git checkout -b实现新建与切换 git checkout -b [branch_name]
修改文件并提交
touch aecho “revise” >a git add a #添加新文件,如果只是修改或者删除则不需要 git addgit commit -a #将修改内容提交到仓库中 git commit --amend #对于已经提交过的代码,如果需要修改,可以借助 git commit --amend 来进行。
查看状态并向master提交合并请求
git status #查看是否已经 commitgit log #查看提交日志 git-review master
3、报错
sign_and_send_pubkey: signing failed: agent refused operation Permission denied (publickey). fatal: Could not read from remote repository. Please make sure you have the correct access rightsand the repository exists.
使用ssh-add命令添加私钥
参考:https://help.github.com/articles/error-permission-denied-publickey/
本文出自 “DanielQu” 博客,请务必保留此出处http://qujunorz.blog.51cto.com/6378776/1901538
gerrit的git配置流程
声明:以上内容来自用户投稿及互联网公开渠道收集整理发布,本网站不拥有所有权,未作人工编辑处理,也不承担相关法律责任,若内容有误或涉及侵权可进行投诉: 投诉/举报 工作人员会在5个工作日内联系你,一经查实,本站将立刻删除涉嫌侵权内容。