gerrit

Gerrit workflow - push single commit to topic branch

由 被刻印的时光 ゝ 提交于 2019-12-10 14:37:35
问题 I want to push a single commit to Gerrit without affecting other commits in the same topic branch. Unfortunately I don't have a test instance of Gerrit to experiment with. Scenario: I have contributed a topic branch to the project, which is in review, and other developers have updated parts of it. Now I wish to make changes on top of their updates. To do this I pull the changes by the other developer in the commit I wish to edit, do an interactive rebase locally to make my own changes, then

Git push error: does not match your user account

由 不想你离开。 提交于 2019-12-10 14:15:24
问题 I executed the following commands: git pull <partner_remote> <partner_branch> git config user.email <my_email> git config user.name <my_name> git commit --amend --reset-author git push <my_remote> HEAD:refs/for/<my_branch> But I got the following error after the "git push": remote: ERROR: In commit b6b74fff7850c4b61a5535519959b1ab58ca6fa9 remote: ERROR: committer email address aaa@aaa remote: ERROR: does not match your user account. remote: ERROR: remote: ERROR: The following addresses are

Adding gerrit label, but not able to see it properly in review page

由 吃可爱长大的小学妹 提交于 2019-12-10 12:14:15
问题 Using gerrit 2.9. I am new to gerrit configuration and am trying to add a Verified label to the All-projects project so that the verified label is shown in the reviews for all projects. The relevant part of the project.config looks like this: [label "Code-Review"] function = MaxWithBlock copyMinScore = true value = -2 This shall not be merged value = -1 I would prefer this is not merged as is value = 0 No score value = +1 Looks good to me, but someone else must approve value = +2 Looks good

gerrit+apache2 can't sign out

由 我与影子孤独终老i 提交于 2019-12-10 03:27:22
问题 I can login the gerrit server and review code. But I can't log out by clicking sign out link on the upper-right when I click sign out, it will return to Code Review Dashboard page Below is my httpd.conf and gerrit.config, please help me!!! tks... <VirtualHost *> ServerName localhost ProxyRequests Off ProxyVia Off ProxyPreserveHost On <Proxy *> Order deny,allow Allow from all </Proxy> <Location /login/> AuthType Basic AuthName "Gerrit Code Review" AuthBasicProvider file AuthUserFile /home/kk

Git workflow and Gerrit

由 我只是一个虾纸丫 提交于 2019-12-09 08:21:34
问题 I am trying to implement a 'git-flow' kind of workflow using Gerrit but I can't seem to figure out the last piece of the puzzle. There are two preconditions to my problem: Gerrit will only perform merging to one branch I do not allow merge commits to be pushed to Gerrit. The merging has to be done by Gerrit after the changes are approved What I want to solve is the following. Consider this git situation: Master 0 \ \ Develop 0-----0-----0-----0 There is a master branch with one commit and a

Exclude author from gerrit review

由 戏子无情 提交于 2019-12-09 05:12:15
问题 I want to disallow the author of a change to review his/her own changes in gerrit. I'm aware of this suggested hack, but that doesn't really solve the issue. Now I learned from the gerrit issues that gerrit's hardcoded rules can be modified by custom prolog code, so it should potentially be possible to modify the workflow as I want. However, I have never modified gerrit's workflow before and I don't know much prolog. Does anyone have a small working example of custom rules for gerrit using

/.git/hooks/: No such file or directory protocol error: expected control record on Mac osx

由 こ雲淡風輕ζ 提交于 2019-12-08 19:39:33
Stumbled across this error today to waste a good amount of time, while trying to have gerrit hook setup for a repository, was using the following command scp -p -P 29418 tttt@tttt.ttt.com:hooks/commit-msg .git/hooks/ on terminal after having checked-out the project via XCode Two reasons for this are: Executing hook command on incorrect folder. Makes sure to execute this command on parent folder of the checked-out folder & not on checked-out folder. Executing hook on a different branch other than on the master branch. Make sure to run the hook command on the master branch, before switching

/.git/hooks/: No such file or directory protocol error: expected control record on Mac osx

由 廉价感情. 提交于 2019-12-08 07:09:01
问题 Stumbled across this error today to waste a good amount of time, while trying to have gerrit hook setup for a repository, was using the following command scp -p -P 29418 tttt@tttt.ttt.com:hooks/commit-msg .git/hooks/ on terminal after having checked-out the project via XCode Two reasons for this are: Executing hook command on incorrect folder. Makes sure to execute this command on parent folder of the checked-out folder & not on checked-out folder. Executing hook on a different branch other

How to solve merge conflict in a approved review in gerrit?

由 只谈情不闲聊 提交于 2019-12-08 05:46:14
问题 I made a change in gerrit which was code reviewed and after 7 revisions approved. But, now it cannot be merged and trying to rebase in gerrit website is not working due to merge conflict. How can I resolve this merge conflict and merge the same approved change and not create a new one. (Full steps from cloning the repo would be appreciated.) 回答1: 1) Clone the Gerrit repository git clone https://USER@GERRIT-SERVER/a/REPO-FULL-PATHNAME 2) Go to the change page on Gerrit and copy the checkout

How to do backup of development branches with Gerrit?

由 [亡魂溺海] 提交于 2019-12-07 23:54:49
问题 I'm using Gerrit to manage my git repository. Patches are sent to Gerrit server and merged into the git repository when they are approved. However, often a feature takes some time to develop and the developer wants to keep a backup of the code under development. The obvious solution is to push the branch directly to Gerrit, but then https://code.google.com/p/gerrit/issues/detail?id=1986 prevents me from submitting this branch to review. A possible hack is to remove the remote branch when I
订阅 gerrit