0

有没有人在执行 git push 之前看到过这个错误？任何调试或克服错误的提示？

mkdir opensource && cd opensource
git clone git://git.qinc.com/platform/vendor/q-opensource/wcn/prime.git
cd prime
git checkout -b jb_2.5 origin/jb_2.5
git cherry-pick -x ..7174961054435d3ae9d233c81227b0715cfc1715
git push ssh://review-android.qinc.com:29418/platform/vendor/q-opensource/wcn/prime.git jb_2.5:refs/for/jb_2.5

test@wcn-linux5:/local/mnt2/workspace2/test/LA_builds/opensource_JB2.5/prime$ git push ssh://review-android.qinc.com:29418/platform/vendor/q-opensource/wlan/prime.git jb_2.5:refs/for/jb_2.5
Enter passphrase for key '/usr2/test/.ssh/id_rsa':
Counting objects: 662, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (100/100), done.
Writing objects: 100% (148/148), 534.35 KiB, done.
Total 148 (delta 88), reused 97 (delta 47)
remote: Resolving deltas: 100% (88/88)
remote: Processing changes: refs: 1, done   
remote: (W) be1d372: no files changed, was rebased
To ssh://review-android.qinc.com:29418/platform/vendor/q-opensource/wlan/prime.git
! [remote rejected] jb_2.5 -> refs/for/jb_2.5 (no changes made)
error: failed to push some refs to 'ssh://review-android.qinc.com:29418/platform/vendor/q-opensource/wlan/prime.git'
4

1 回答 1

1

看起来有人承诺，推动，重新定位，承诺，然后进行强制推动以改写历史。

Brian Campbell 回答的一个症状：Git non-fast-forward denied

我相信您遇到的是有人在回购中改写了历史。不是一个很好的情况。你拉了吗？您可能需要克隆 repo 的新副本，因为您的历史记录不再符合服务器的历史记录并再次进行更改。

于 2012-12-20T17:23:38.867 回答