遇到问题:
Repo upload pre-hook check report:
Git (ambarella/include): Pass
Git (kernel/linux-4.14): Pass
Git (kernel/private): Pass
Git (unit_test/private): Pass
Taglist: Exuberant ctags (http://ctags.sf.net) not found in PATH. Plugin is not loaded.
Press ENTER or type command to continue
remote: Processing changes: refs: 1, done
remote: (W) 00c0539: commit subject >65 characters; use shorter first paragraph(报错关键词)
To ssh://amcode.ambarella.com:29418/ambarella/include
! [remote rejected] v5_prevent_bsb_being_overrite_v1 -> refs/for/iav_v4 (change http://amcode.ambarella.com/107878 closed)
error: failed to push some refs to 'ssh://:29418/ambarella/include'
----------------------------------------------------------------------
[FAILED] ambarella/include/ v5_prevent_bsb_being_overrite_v1 (Upload failed)
问题原因:本分支下前一次提交代码的时候,虽然提交成功了,但没有merge到远程分支里边,被abandon掉了。但是那次提交成功是有一个对应commit id(e5*** )。
解决方法:1、git log --查看提交记录
commit I3*** 本次提交失败了
commit e5*** 上一次提交,然后abandon了
commit c4*** 最近的一次提交记录
2、将代码回退到“最近一次的提交记录”版本,操作为:git reset --soft c4***, 此时当前的 commit ID 为"I3***” 相对于commit ID “ c4*** ”的修改将恢复到暂存区,这个时候重新git commit -m “” 推到版本区,git push,或者repo upload 推道远程。