gerrit/git操作中遇到的问题

问题1：lack ‘forge committer’ permission.

remote: ERROR: commit 639e7ed: email address linux@163.com is not registered in your account, and you lack ‘forge committer’ permission.

$ git push origin dev:zigbee_dev
Enumerating objects: 93, done.
Counting objects: 100% (93/93), done.
Delta compression using up to 6 threads
Compressing objects: 100% (90/90), done.
Writing objects: 100% (92/92), 427.40 KiB | 4.59 MiB/s, done.
Total 92 (delta 8), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (8/8)
remote: Processing changes: refs: 1, done
remote: ERROR: commit 639e7ed: email address oplinux@163.com is not registered in your account, and you lack 'forge committer' permission.
remote: You have not registered any email addresses.
remote: To register an email address, visit:
remote: http://192.168.3.3:8081/settings#EmailAddresses
remote:
remote:
To ssh://192.168.3.3:29418/zigbee_soc_module.git! [remote rejected] dev -> zigbee_dev (commit 639e7ed: invalid committer)
error: failed to push some refs to 'ssh://192.168.3.3:29418/zigbee_soc_module.git'
$

解决1：将用户所在分组dev加入到refs/heads/*的Forge Committer Identity中

问题2：remote: To push into this reference you need ‘Push’ rights.

$ git push origin dev:zigbee_dev
Enumerating objects: 93, done.
Counting objects: 100% (93/93), done.
Delta compression using up to 6 threads
Compressing objects: 100% (90/90), done.
Writing objects: 100% (92/92), 427.40 KiB | 4.80 MiB/s, done.
Total 92 (delta 8), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (8/8)
remote: error: branch refs/heads/zigbee_dev:
remote: To push into this reference you need 'Push' rights.
remote: User: snow
remote: Contact an administrator to fix the permissions
remote: Processing changes: refs: 1, done
To ssh://192.168.3.3:29418/zigbee_soc_module.git! [remote rejected] dev -> zigbee_dev (prohibited by Gerrit: not permitted: update)
error: failed to push some refs to 'ssh://192.168.3.3:29418/zigbee_soc_module.git'

解决2：将用户所在分组dev加入到refs/heads/*的Push中

问题3：hint: Updates were rejected because a pushed branch tip is behind its remote

$ git push -u origin dev:zigbee_dev
To ssh://192.168.3.3:29418/zigbee_soc_module.git! [rejected]        dev -> zigbee_dev (non-fast-forward)
error: failed to push some refs to 'ssh://192.168.3.3:29418/zigbee_soc_module.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

解决3：新仓库在push之前，需要先执行git pull操作

问题4：fatal: refusing to merge unrelated histories

$ git pull
fatal: refusing to merge unrelated histories

解决4：pull添加--allow-unrelated-histories参数

$ git pull --allow-unrelated-histories
Already up to date!
Merge made by the 'recursive' strategy.

问题5：git add时，文件过长报错Filename too long

admin@DESKTOP-DAU6V5J MINGW64 /d/Silicon/developer/sdks/gecko_sdk_suite/v2.7/app/build/Zigbee-Smart-Gate (zigbee_dev)
$ git add .
error: open(".pdm/com.silabs.module.additional.pdm.com.silabs.ss.framework.project.toolchain.core.default#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.7.2.1.20170904 - EFR32MG21A020F1024IM32.slsproj"): Filename too long
error: unable to index file '.pdm/com.silabs.module.additional.pdm.com.silabs.ss.framework.project.toolchain.core.default#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.7.2.1.20170904 - EFR32MG21A020F1024IM32.slsproj'
fatal: adding files failedadmin@DESKTOP-DAU6V5J

解决5：git config --global core.longpaths true

git能够创建长度为4096的文件名，但在windows中下使用git时，由于git用了旧版本的windows api，默认文件名最长为260。

admin@DESKTOP-DAU6V5J MINGW64 /d/Silicon/developer/sdks/gecko_sdk_suite/v2.7/app/build/Zigbee-Smart-Gate (zigbee_dev)
$ git config --global core.longpaths trueadmin@DESKTOP-DAU6V5J MINGW64 /d/Silicon/developer/sdks/gecko_sdk_suite/v2.7/app/build/Zigbee-Smart-Gate (zigbee_dev)
$ git add .admin@DESKTOP-DAU6V5J MINGW64 /d/Silicon/developer/sdks/gecko_sdk_suite/v2.7/app/build/Zigbee-Smart-Gate (zigbee_dev)
$ git status
On branch zigbee_dev
Your branch is up to date with 'origin/zigbee_soc_gate'.Changes to be committed:(use "git restore --staged <file>..." to unstage)modified:   .gitignorenew file:   .pdm/com.silabs.module.additional.pdm.com.silabs.ss.framework.project.toolchain.core.default#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.7.2.1.20170904 - EFR32MG21A020F1024IM32.slsprojnew file:   .pdm/com.silabs.module.additional.pdm.com.silabs.ss.framework.project.toolchain.core.default#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.7.2.1.20170904 - EFR32MG21A020F768IM32.slsprojnew file:   .pdm/com.silabs.module.additional.pdm.com.silabs.ss.framework.project.toolchain.core.default#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt.7.2.1.20170904.slsprojnew file:   .settings/com.silabs.ss.framework.ide.project.sls.core.prefsadmin@DESKTOP-DAU6V5J MINGW64 /d/Silicon/developer/sdks/gecko_sdk_suite/v2.7/app/build/Zigbee-Smart-Gate (zigbee_dev)
$

gerrit/git操作中遇到的问题相关推荐

gerrit git 邮箱不匹配的问题
在家目录下面同时clone两个repo,TEST1 和 TEST2 在TEST1 repo下面可以正常git add git commit 然后git push 但是在TEST2 repo下面git ...
Git2.29让Git成功“牵手”Gerrit
GitHub 和 Gerrit 都是诞生于 2008 年的代码平台,两个平台各自形成了相互独立的生态.GitHub 及其模仿者们成为行业主流,托管着大多数开源项目和商业项目的源代码,而 Gerrit ...
git与gerrit基础概念
序本文记录了 git 与 gerrit 学习所得重点关注于当前所用到的实际操作部分,其余理论部分以及更复杂用法留待将来用到时继续补充 1 Git 与 Gerrit Git 是当前全世界流行的分布式 ...
初中高级的 git 和 gerrit 技巧【大型项目实战总结 CR 经验】
序前半部分属于基础,后半部分属于进阶.从初级到中级再到我都 hold 不住的高级.全文共 12000 余字,超干超干的那种. 然而,写完一半的时候,我突然虎躯一震,我是不是在造轮子?随后我悄悄的搜了 ...
基于OpenDaylight的二次开发一步一个脚印（一）GIT源代码
Git学习准备可以大概学习下git相关知识.参考http://www.liaoxuefeng.com/的git教程下载git 下载git安装程序mysysgit(这是git的客户端,包含了git本 ...
docker运行gerrit(代码审查工具)
gerrit是什么? Gerrit,一种免费.开放源代码的代码审查软件,使用网页界面. gerrit背景 Gerrit,一种免费.开放源代码的代码审查软件,使用网页界面.利用网页浏览器,同一个团队的软 ...
Gitlab+Gerrit+Jenkins完整对接
近年来,由于开源项目.社区的活跃热度大增,进而引来持续集成(CI)系统的诞生,也越发的听到更多的人在说协同开发.敏捷开发.迭代开发.持续集成和单元测试这些拉风的术语.然而,大都是仅仅听到在说而已,国内 ...
git reset --hard、git reset --sort及git revert区别
一. 在git操作中,有时候,进行了错误的提交,但是还没有push到远程分支,想要撤销本次提交,可以使用git reset –-soft/hard命令. 1.二者区别: git reset –-sof ...
git checkout 命令详解
转自:http://www.cnblogs.com/hutaoer/archive/2013/05/07/git_checkout.html?utm_source=tuicool&utm_me ...
git——^和~的区别（转）
原文地址: http://www.cnblogs.com/softidea/p/4967607.html 一. 引子在git操作中,我们可以使用checkout命令检出某个状态下文件,也可以使用re ...