Unable to push changes "Failed to push some refs" EOF error

Question

I am unable to push changes from a branch on a repository that has been working for years, as of 3 days ago. I get the errors below, sometimes with a brief attempt to push LFS content before failing:

Pushing to bitbucket.org:ScottBrodie/wearethecaretakers2.git
EOF
error: failed to push some refs to 'bitbucket.org:ScottBrodie/wearethecaretakers2.git'
Completed with errors, see above.

I can pull and fetch (From main as well as from LFS only), but cannot push. I have tried the low hanging fruit solutions such as updating SourceTree, my local embedded git, LFS pulls, using the terminal with commands from online search results, etc. I am stumped and would appreciate any leads on solutions. Hoping to avoid having to reclone and lose my recent commits on my local branch, but open to that being necessary.

Is there any way to determine if this is an issue on the bitbucket end vs something messed with refs locally? I have the 100GB LFS upgrade with only 15GB used, so I don't think it's a space issue. Perhaps with the space in the main repo? Thanks for any help, been blocked for days.

Ben · Answer

Hey Scott,

No worries, let me know how it goes.

Just a note as well, if you require lfs files to be present on your system after performing the clone (the LFS files will still be present remotely, your local will just contain pointers to these files), you can run this command afterward:

git lfs fetch --all

Cheers!

- Ben (Bitbucket Cloud Support)

ScottBrodie · Answer

Thank you Ben. I am in the process of deleting the local repo and recloning. I'll update the thread with the results in the next 1-2 days.

Ben · Answer

Hey Scott,

I agree that if you are able to push changes to your remote repo - but not this particular repository, there appears to be something problematic happening on the local repo.

For this case, I would recommend first backing up any changed files which you had intended to commit.

You have two options essentially to resolve this - one is to simply delete the local repository entirely to start from a fresh slate and then perform a new clone to begin working locally again (copy changed files and push these after the fact).

The other is to attempt to repair your local branches by removing their local copies and syncing them with your remote, then resetting the local head to the current remote commit which is a more complex process that I have detailed below.
NOTE: some_other_branch refers to any other branch than the one you are currently fixing, this is because you can't delete a branch while you're already inside that branch

* Perform git branch command to get a list of your local branches in your local repository and copy this list somewhere, you will need to run the commands below for each branch on that list

* Now that you have a list of the branches, you can begin fixing their commit history (commands are case sensitive):

git checkout some_other_branch
git branch -D branch1
git checkout -b branch1 origin/branch1
git pull origin branch1
git reset --hard origin/branch1

* Verify that the local commit history matches the remote by comparing the commit list on your remote repo vs local:

git log -5

* Repeat above steps for all of the local branches and then try to push to the repo once you have finished all of these, you should see the following output which means that the local and remote branches are synced properly:

> git push --force
Everything up-to-date

Hope this helps.

Cheers!

- Ben (Bitbucket Cloud Support)