hard and a remote repository

2018-06-17 07:20:27

I had a repository that had some bad commits on it (D, E and F for this example).

ABCDEF master and origin/master

I've modified the local repository specifically with a git reset --hard . I took a branch before the reset so now I have a repo that looks like:

A-B-C master  
      D-E-F old_master

A-B-C-D-E-F origin/master

Now I needed some parts of those bad commits so I cherry picked the bits I needed and made some new commits so now I have the following locally:

A-B-C-G-H master
      D-E-F old_master

Now I want to push this state of affairs to the remote repo. However, when I try to do a git push Git politely gives me the brush off:

$ git push origin +master:master --force  
Total 0 (delta 0), reused 0 (delta 0)  
error: denying non-fast forward refs/heads/master (you should pull first)  
To git@git.example.com:myrepo.git  
! [remote rejected] master -> master (non-fast forward)  
error: failed to push some refs to 'git@git.example.com:myrepo.git'

How do I get the remote repo to take the current state of the local repo?

If forcing a push doesn't help (" git push --force origin " or " git push --force origin master " should be enough), it might mean that the remote server is refusing non fast-forward pushes either via receive.denyNonFastForwards config variable (see git config manpage for description), or via update / pre-receive hook.

With older Git you can work around that restriction by deleting " git push origin :master " (see the ':' before branch name) and then re-creating " git push origin master " given branch.

If you can't change this, then the only solution would be instead of rewriting history to create a commit reverting changes in DEF :

A-B-C-D-E-F-[(D-E-F)^-1]   master

A-B-C-D-E-F                             origin/master

To complement Jakub's answer, if you have access to the remote git server in ssh, you can go into the git remote directory and set:

user@remote$ git config receive.denyNonFastforwards false

Then go back to your local repo, try again to do your commit with --force :

user@local$ git push origin +master:master --force

And finally revert the server's setting in the original protected state:

user@remote$ git config receive.denyNonFastforwards true

Instead of fixing your "master" branch, it's way easier to swap it with your "desired-master" by renaming the branches. See https://stackoverflow.com/a/2862606/2321594. This way you wouldn't even leave any trace of multiple revert logs.

链接地址: http://www.djcxy.com/p/48924.html

上一篇: 意外推送提交：更改git提交消息

下一篇: 硬和远程存储库