Git merge后repo upload失败， 报如下错误
[root@- control-plane]# repo upload
ATTENTION: One or more branches has an unusually high number of commits.
YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across branches?)
If you are sure you intend to do this, type 'yes': yes^H^H^H
error: upload aborted by user
[root@- control-plane]# repo upload
Counting objects: 11, done.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 697 bytes | 0 bytes/s, done.
Total 6 (delta 4), reused 0 (delta 0)
remote: Resolving deltas: 100% (4/4)
remote: Processing changes: new: 1, refs: 1, done
remote:
remote: New Changes:
remote: http://172.16.164.211/8645 key-set/id-set命令节点增加
remote:
To ssh://[email protected]:29418/flexnfv-xp/management-plane
* [new branch] develop -> refs/for/develop
----------------------------------------------------------------------
[OK ] management-plane/ develop
原因是因为merge过来后，merge信息没有Change-ID，这个Change-ID是repo在commit提交时钩子中打上的，但是git merge不打这个标记，
因此校验失败，因此merge过来后需要amend重新commit。
但后来我又提交了几个commit，就需要重新弄一下。
[root@- control-plane]# git log
merge后新提交的
commit 1d34255c56b3eae7d69e4e6810ee91c128023068
Date: Tue Dec 22 10:52:04 2015 +0800
key-set/id-set命令调试bug
Change-Id: I34c2931ee2b70649f8d8093a2b086a3a69202184
commit af383d5764be13cdb23ea3e9123b4e5227051038
Date: Tue Dec 22 10:25:30 2015 +0800
链表头忘记初始化
Change-Id: I83b22508d78244823eeb3b1c760abcb3fcf5cf99
引起问题的merge，没有Change-Id
commit d6092bb7d9f1f5fa3cf7295b86618f70094ed54c
Merge: 593d108 e8c674d
Date: Tue Dec 22 10:23:07 2015 +0800
Merge branch 'tmp_branch' into develop
IPsec cli
Merge的几个提交
commit e8c674d2e74de9bf171960d07d2f7e2fc54fe71a
Date: Tue Dec 22 09:24:03 2015 +0800
key-set/id-set .. 4 cli部分名
Change-Id: I97bb9cbac7498aaa147d1f6cb7d6963adad245c3
commit 2dd0766ada0731892aad9e615f755c8e28cf230d
Date: Mon Dec 21 16:49:33 2015 +0800
key-set/id-set .. 3 cli部分命令
Change-Id: I6dd5066a34aaf30131268a0b462955c13ca63359
先回退到提交分支的head
[root@- control-plane]# git reset --hard origin/develop
HEAD is now at 593d108 配合confd修改编译错误
[root@- control-plane]# git log
commit 593d1086b9dc8592706b791fc1d18bf16958da6c
Date: Thu Dec 3 17:35:06 2015 +0800
配合confd修改编译错误
Change-Id: I33e02c00646b5b9596c1030c65dbad7ca07fd70e
看一下Git提交路线
[root@- control-plane]# git log --all --decorate --graph
* commit 2a0bbb4c053878c7e66378352e78a56a43edbefa (refs/stash)
|\ Merge: 1d34255 0edaf42
| |
Date: Tue Dec 22 10:53:10 2015 +0800
| |
| | WIP on develop: 1d34255 key-set/id-set命令调试bug
| |
| * commit 0edaf42b5c8dc739e9a10e214c6477ae39f7edb1
|/
| Date: Tue Dec 22 10:53:10 2015 +0800
|
| index on develop: 1d34255 key-set/id-set命令调试bug
|
* commit 1d34255c56b3eae7d69e4e6810ee91c128023068
|
| Date: Tue Dec 22 10:52:04 2015 +0800
|
| key-set/id-set命令调试bug
|
| Change-Id: I34c2931ee2b70649f8d8093a2b086a3a69202184
|
* commit af383d5764be13cdb23ea3e9123b4e5227051038
|
| Date: Tue Dec 22 10:25:30 2015 +0800
|
| 链表头忘记初始化
|
| Change-Id: I83b22508d78244823eeb3b1c760abcb3fcf5cf99
|
* commit d6092bb7d9f1f5fa3cf7295b86618f70094ed54c
|\ Merge: 593d108 e8c674d
| |
| | Date: Tue Dec 22 10:23:07 2015 +0800
| |
| | Merge branch 'tmp_branch' into develop
| | IPseccli
| |
| * commit e8c674d2e74de9bf171960d07d2f7e2fc54fe71a (tmp_branch)
| |
| | Date: Tue Dec 22 09:24:03 2015 +0800
| |
| | key-set/id-set .. 4 cli部分名
| |
| | Change-Id: I97bb9cbac7498aaa147d1f6cb7d6963adad245c3
| |
| * commit 2dd0766ada0731892aad9e615f755c8e28cf230d
| |
| | Date: Mon Dec 21 16:49:33 2015 +0800
| |
| | key-set/id-set .. 3 cli部分命令
| |
| | Change-Id: I6dd5066a34aaf30131268a0b462955c13ca63359
| |
| * commit 15f8a7b04f43642db3ce2646ff492e4a920363c3
| |
| | Date: Mon Dec 21 15:41:59 2015 +0800
| |
| | key-set/id-set .. 2 print
| |
| | Change-Id: Iae39531e63e89487d04469af73a45a84c61e9008
| |
| * commit 889656c90f37f4463dffd9591204f62713d95020
| |
| | Date: Mon Dec 21 15:27:57 2015 +0800
| |
| | key-set/id-set .. 1
| |
| | Change-Id: If868874e31062aee25131668d4a7fa24cf3a66f8
| |
* | commit 593d1086b9dc8592706b791fc1d18bf16958da6c (HEAD, origin/develop, m/master, develop)
| |
| | Date: Thu Dec 3 17:35:06 2015 +0800
| |
| | 配合confd修改编译错误
| |
| | Change-Id: I33e02c00646b5b9596c1030c65dbad7ca07fd70e
| |
然后把自己的提交全部cherry-pick上去，注意不能提交merge那个提交点
[root@- control-plane]# git cherry-pick 889656c90f37f4
[develop 7a5cc4a] key-set/id-set .. 1
3 files changed, 437 insertions(+)
[root@- control-plane]# git cherry-pick 15f8a7b04f43642d
[develop 7e7d792] key-set/id-set .. 2 print
1 file changed, 116 insertions(+)
[root@- control-plane]# git cherry-pick 2dd0766ada0731892a
[develop 10d6cb9] key-set/id-set .. 3 cli部分命令
4 files changed, 274 insertions(+), 20 deletions(-)
[root@- control-plane]# git cherry-pick e8c674d2e74de9bf1719
[develop b7d523a] key-set/id-set .. 4 cli部分名
2 files changed, 586 insertions(+), 10 deletions(-)
[root@- control-plane]# git cherry-pick af383d5764be13cdb23ea
[develop add4db7] 链表头忘记初始化
1 file changed, 2 insertions(+)
[root@- control-plane]# git cherry-pick 1d34255c56b3eae7d69e4
[develop fda0422] key-set/id-set命令调试bug
2 files changed, 3 insertions(+), 3 deletions(-)
[root@- control-plane]# git log --all --decorate --graph
[root@- control-plane]# git status
# On branch develop
nothing to commit, working directory clean
[root@- control-plane]# repo upload
Upload project control-plane/ to remote branch develop:
branch develop ( 6 commits, Tue Dec 22 11:10:31 2015 +0800):
7a5cc4ad key-set/id-set .. 1
7e7d792e key-set/id-set .. 2 print
10d6cb98 key-set/id-set .. 3 cli部分命令
b7d523a2 key-set/id-set .. 4 cli部分名
add4db7e 链表头忘记初始化
fda0422d key-set/id-set命令调试bug
to http://172.16.164.211 (y/N)? y
ATTENTION: You are uploading an unusually high number of commits.
YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across branches?)
If you are sure you intend to do this, type 'yes': yes
Counting objects: 61, done.
Compressing objects: 100% (48/48), done.
Writing objects: 100% (48/48), 8.32 KiB | 0 bytes/s, done.
Total 48 (delta 39), reused 0 (delta 0)
remote: Resolving deltas: 100% (39/39)
remote: Processing changes: new: 6, refs: 6, done
remote:
remote: New Changes:
remote: http://172.16.164.211/8649 key-set/id-set .. 1
remote: http://172.16.164.211/8650 key-set/id-set .. 2 print
remote: http://172.16.164.211/8651 key-set/id-set .. 3 cli部分命令
remote: http://172.16.164.211/8652 key-set/id-set .. 4 cli部分名
remote: http://172.16.164.211/8653 链表头忘记初始化
remote: http://172.16.164.211/8654 key-set/id-set命令调试bug
remote:
To ssh://[email protected]:29418/flexnfv-xp/control-plane
* [new branch] develop -> refs/for/develop
----------------------------------------------------------------------
[OK ] control-plane/ develop
[root@- control-plane]#
[root@- control-plane]#
[root@- control-plane]#
