gerrit

Git / gerrit, push remote rejected no changes made

匿名 (未验证) 提交于 2019-12-03 02:03:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Made changes to a commit, performed commit amend. Do a push and I get the error: ! [remote rejected] master -> refs/for/master (no changes made) Checked the change ID in the commit message and its still a valid commit. I've tried changing a file, checking it shows up as an alteration and then added to staging area and done another commit amend. Try the push again and getting the same issue. No idea on this one. Edit: This is pushing to gerrit, not git directly. I'm running: git push origin master:refs/for/master And the result of getting the

Cannot merge in Gerrit

a 夏天 提交于 2019-12-03 02:02:50
问题 Whenever I sent a review to Gerrit and if the review is pending for some time, I am getting cannot merge message in Gerrit. I understood its coming because somebody else would have changed same file/files and delivered before me. I am trying below workaround to solve my issue. Abandon the current review. Create a new local branch, take a pull Cherry-pick my commit from old branch and send to gerrit This works but the review comments whatever I had would no longer be available and it is

git unpack error on push to gerrit

匿名 (未验证) 提交于 2019-12-03 01:54:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: On push of a new branch to a gerrit server we encounter the following error: de@roma:~/git-hate/www$ git push origin landingpage Counting objects: 149, done. Delta compression using up to 2 threads. Compressing objects: 100% (73/73), done. Writing objects: 100% (111/111), 2.77 MiB, done. Total 111 (delta 68), reused 80 (delta 38) remote: Resolving deltas: 100% (68/68) error: unpack failed: error Missing tree 30c4809ade0b4b0c81cb7f882450774862b82361 fatal: Unpack error, check server log To ssh://user@git-server/repository ! [remote rejected]

Creating SSH keys for Gerrit and Hudson

匿名 (未验证) 提交于 2019-12-03 01:48:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I'm trying to use the Hudson Gerrit Trigger plug-in. For whatever reason, Gerrit is not accepting the SSH key located at /var/lib/hudson/.ssh/id_rsa . In the GUI I get Connection error : com.jcraft.jsch.JSchException: Auth fail as an error, and when I'm working in the terminal I get a Permission denied (publickey) error. How can I generate and use a working private key so Hudson and Gerrit can play nice? 回答1: The OP Josh Smith managed to sort it out: I'd actually needed to add the SSH key from /var/lib/hudson/.ssh/id_rsa.pub for the user (me

Gerrit Change has Status:Submitted, Merge Pending, how to solve it?

匿名 (未验证) 提交于 2019-12-03 01:39:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: The Gerrit system is only used by us several people. Once there is a Change A, and its status is: "Submitted, Merge Pending". The change list in the "open" web page. Also I noticed this Change had a dependency on another change B (which status is abandoned). How to make A listed on "Merged" web page ? How to make B disappear, so A has no more dependency on B ? 回答1: If change A has a dependency on B, then A cannot be merged until B is merged. Since you have abandoned B, Gerrit will not automatically merge A. What you will need to do

How to configure server side hooks in Gerrit 2.16

匿名 (未验证) 提交于 2019-12-03 01:39:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I have started using Gerrit 2.16 as code review tool and want to configure server side hooks to validate the git commit message when a change is committed/pushed to gerrit. Tried using hooks by copying scripts to $GIT_DIR/hooks (scripts like ref-update, patchset-created, change-merged), gave permission on the gerrit server but nothing works. commit-msg hook can be enabled on local repository by using command give in gerrit UI example: git clone ssh://@:29418/Project1 && scp -p -P 29418 @:hooks/commit-msg /.git/hooks/ change_ID will be

Register in gerrit with OpenID failed

匿名 (未验证) 提交于 2019-12-03 01:22:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I'm trying to setup the gerrit these days,but when it comes to Register with OpenID,there is always a problem " Provider is not supported, or was incorrectly entered." I have seen the same question on OpenID with Gerrit not working i didn't find the answer.If this is a bug in previous version,My gerrit version is gerrit-1.2.1.6 and it shouldn't have the bug. I noticed that in my corporation my IP address is private 10.238.151.109,and I set the canonical URL like this http://10.238.151.109:8080,then I can access gerrit server in the local

Is there anything for subversion as gerrit for git? [closed]

你。 提交于 2019-12-03 01:14:05
Gerrit is useful but it's only for git. I want to setup something like it, but for subversion. Is there any software doing this job? For which part: code review or hosting or both? For code reviews, Review Board works well. It's not perfect, but I've used it to great success on a couple of projects. It doesn't deal at all with hosting or access controls though. For hosting, you might try usvn , SVNManager , or svn-access-manager . I've not really used any of these tools, so I can't really comment on their usefulness. You can try using phabricator . It can be used for SVN and Git. It does a lot

Git / gerrit, push remote rejected no changes made

匿名 (未验证) 提交于 2019-12-03 01:05:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Made changes to a commit, performed commit amend. Do a push and I get the error: ! [remote rejected] master -> refs/for/master (no changes made) Checked the change ID in the commit message and its still a valid commit. I've tried changing a file, checking it shows up as an alteration and then added to staging area and done another commit amend. Try the push again and getting the same issue. No idea on this one. Edit: This is pushing to gerrit, not git directly. I'm running: git push origin master:refs/for/master And the result of getting the

Branch/change not merged, though Gerrit claims, it is

匿名 (未验证) 提交于 2019-12-03 00:57:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 由 翻译 强力驱动 问题: Each time, I see merged status on my change in Gerrit and I do git pull origin , I can clearly see, that my change/branch hasn't actually been merged into master. Please, review my Gerrit's workflow and tell me, what I'm doing wrong or what am I missing: Create & checkout branch locally. git checkout -b 77-blah Do the magic and comment all changes. git commit -am "changes to 77-blah" Create the same branch using UI and setting its revision to HEAD (this should be automated soon ). Push changes (that particular branch) to Gerrit,