当Gerrit的Cubmit类型为cherry pick时的工作方式

Fast Forward Only意味着submit一个检视后,同一个目的分支的其他open状态的检视需要rebase操作.
没有合并提交产生,所有的合并都必须在客户端完成后再上传到Gerrit,在实践中对于检视比较少的项目比较合适.
Merge If Necessary这是创建新项目的默认值.当检视不是fast-forwarded类型时,会创建一个合并提交.
Cherry-pick在submit时cherry pick检视的补丁,在当前分支上创建一个新的提交.
并且Gerrit会自动添加一些检视信息到注释中,这个时候提交的SHA和之前的SHA是不一样的.

Reviewed-on: http://localhost:8090/15
Tested-by: xxx
Reviewed-by: xxx

当Gerrit项目设置Submit Type为Cherry-pick时

git log --oneline --graph --decorate
* ba3b4a0 (HEAD -> master) cherry pick
* 12f768c (origin/master, origin/HEAD) delete some content
#提交新的检视
git push origin master:refs/for/master
#检视通过后更新到本地
git pull origin master
git log --oneline --graph --decorate
*   9c7a79a (HEAD -> master) Merge branch 'master' of ssh://localhost:29418/gerrit_ci
|\  
| * 4538d8a (origin/master, origin/HEAD) cherry pick
* | ba3b4a0 cherry pick
|/  
* 12f768c delete some content
#发现更新下来的提交SHA值和注释发生了变化
#git仓库中有blob,tree,commit和tag对象,查看这些对象的SHA
git log --graph --pretty=format:'Commit SHA:%Cred%h%Creset Comment:%s %n Tree SHA:%C(yellow)%t%Creset %n Parent SHA: %Cgreen%p%Creset'

*  Commit SHA:9c7a79a Comment:Merge branch 'master' of ssh://localhost:29418/gerrit_ci
|\  Tree SHA:820dca9
| | Parent SHA: ba3b4a0 4538d8a
| *Commit SHA:4538d8a Comment:cherry pick
| | Tree SHA:820dca9
| | Parent SHA: 12f768c
* |Commit SHA:ba3b4a0 Comment:cherry pick
|/  Tree SHA:820dca9
|   Parent SHA: 12f768c
*  Commit SHA:12f768c Comment:delete some content
#两个提交Tree和Tree的SHA值都一样,只是因为注释不同Commit的SHA值也不同
#进行rebase合并,使得本地与服务器保持一致
git rebase -i
git rebase --continue
Successfully rebased and updated refs/heads/master.
git log --oneline --graph --decorate
* 4538d8a (HEAD -> master, origin/master, origin/HEAD) cherry pick
* 12f768c delete some content

参照:

• intro-project-owner
• project-configuration