为什么即使我的本地 repo 是最新的远程仓库，`git push --force-with-lease` 也会失败并显示“rejected ... stale info”？

Question

I'm trying to force push a rebase of a feature branch to a remote repository. To be a bit safer, I'm trying to use --force-with-lease to make sure no other changes have happened in the branch since I last fetched it.

This is failing for reasons I don't understand:

$ git branch
* my-branch
  master

$ git push --force-with-lease origin my-branch -u
To gitlab.com:example/my-project.git
 ! [rejected]        my-branch -> my-branch (stale info)
error: failed to push some refs to 'git@gitlab.com:example/my-project.git'

I tried a fetch to see if my local cache had somehow gotten out of sync:

$ git fetch

$ git push --force-with-lease origin my-branch -u
To gitlab.com:example/my-project.git
 ! [rejected]        my-branch -> my-branch (stale info)
error: failed to push some refs to 'git@gitlab.com:example/my-project.git'

I tried simplifying the push command a bit:

$ git push --force-with-lease
To gitlab.com:example/my-project.git
 ! [rejected]        my-branch -> my-branch (stale info)
error: failed to push some refs to 'git@gitlab.com:example/my-project.git'

I tried limiting the check to my branch:

$ git push --force-with-lease=my-branch:origin/my-branch
To gitlab.com:example/my-project.git
 ! [rejected]        my-branch -> my-branch (stale info)
error: failed to push some refs to 'git@gitlab.com:example/my-project.git'

As you can see, it fails the same way every time.

Why is my push failing, and how do I fix it?

Answer 1

If you just have done your rebase and don't want to start over again please run git remote prune origin . If you then run git push --force-with-lease again, it will work.

Answer 2

In this case it turned out that the problem was that the remote branch had been deleted, but there was still a copy of it in my local repo. Fetch doesn't delete local copies by default, which is why it had no effect.

Adding the --prune option to my initial git pull (before doing my rebase) corrects this problem.

Answer 3

在我的情况下，一个简单的git fetch然后再次推送解决了这个问题。