How do you remove an invalid remote branch reference from Git?
Asked Answered
I

13

840

In my current repo I have the following output:

$ git branch -a
* master
  remotes/origin/master
  remotes/public/master

I want to delete remotes/public/master from the branch list:

$ git branch -d remotes/public/master
error: branch 'remotes/public/master' not found.

Also, the output of git remote is strange, since it does not list public:

$ git remote show 
origin

How can I delete 'remotes/public/master' from the branch list?

Update, tried the git push command:

$ git push public :master
fatal: 'public' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
Inconspicuous answered 2/7, 2009 at 2:39 Comment(7)
Did git remote prune [remote-name] or git fetch -p [remote-name] not work in your scenario? Doing it with git gc is a lot more forceful than is normally needed.Photina
git remote prune [remote-name] won't work with git svn, although neither does git gc... git branch -rd origin/name does work though. @Casey, you probably should select the second answer -it's slightly less dangerous.Filtration
I love this question. Coming back almost every monthGrope
Related, if not a dupe target: Delete a Git branch both locally and remotely.Katonah
To avoid n00b gitter error in the future, I recommend using a different example branch than master...particularly when deleting on the remote.Harrietteharrigan
The real question is, how/why does Git manage to get into the broken state in the first place... Local branch is deleted, remote branch is deleted, but Git is clinging to old dated information. Who thought it was a good idea to not delete everything when a branch was deleted. What disingenuous behavior....Blackness
How I arrived at this kind of situation: I had origin cloned at two machines, computer1 and computer2. On computer2, I added computer1 as a remote, and then did git push computer2 --mirror. Now on computer1, I have branches of the remotes/computer1/branchname form even though (quite understandably) it is not tracking itself as a remote.Jeunesse
B
833

You might be needing a cleanup:

git gc --prune=now

or you might be needing a prune:

git remote prune public

prune

Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in "remotes/<name>".

With --dry-run option, report what branches will be pruned, but do no actually prune them.

However, it appears these should have been cleaned up earlier with

git remote rm public 

rm

Remove the remote named <name>. All remote tracking branches and configuration settings for the remote are removed.

So it might be you hand-edited your config file and this did not occur, or you have privilege problems.

Maybe run that again and see what happens.


Advice Context

If you take a look in the revision logs, you'll note I suggested more "correct" techniques, which for whatever reason didn't want to work on their repository.

I suspected the OP had done something that left their tree in an inconsistent state that caused it to behave a bit strangely, and git gc was required to fix up the left behind cruft.

Usually git branch -rd origin/badbranch is sufficient for nuking a local tracking branch , or git push origin :badbranch for nuking a remote branch, and usually you will never need to call git gc

Bock answered 2/7, 2009 at 2:42 Comment(15)
I don't want to delete the branch on the remote side. I think there is a subtle difference.Inconspicuous
er, the question is effectively asking "how do I delete a remote branch". Thats what those paths are.Bock
I will rephrase the subject if that makes it more clear what I'm asking, but the command show exactly what my problem is.Inconspicuous
git gc isn't needed here, but git remote prune makes me feel safer than manually deleting things with git branch -rd, since git is verifying which remote branches are done.Atwekk
this didn't work for me - the 'git branch -rd' worked fine, however.Warenne
@orange80 is right. His answer below is the correct one. This is yet another case of the wrong answer being marked correct just because it works. Please update the correct answer.Cinema
I did the git branch -rd origin/whatever and Git Bash did report Deleted remote branch origin/whatever, however, when I look at the Project in GitHub the branch is still shown. Why is it still shown on GitHub and how can I get off there ? NOTE: git branch -a doesn't show the branch anymore that I deleted (but it's still shown in GitHub)Dissociation
I just did a git fetch origin and the remote branch is back. It was happily announced with "[new branch]"Dissociation
The accepted solution here worked for me (git push origin --delete <branchName>) https://mcmap.net/q/12217/-how-do-i-delete-a-git-branch-locally-and-remotelyDissociation
For context, the need to call 'git gc' was because they'd inherently done something that left their git tree in a somewhat broken state, ie: the configuration no longer pointed to the remotes, but the remotes were still stored on disk , and 'gc' is just fixing this up. But in the general case, the push and -rd techniques are preferred.Bock
@SomeoneSomewhere , you were confusing "tracking branches" ( mirrors of branches on the remote side ) with "remote branches" ( the branch that there is a mirror of ). Hence why you need a git push of some kind to tell the far side "this branch can die now". But git branch -rd , despite the name 'remote', only behaves locally.Bock
Lol... yet another piece of Git advice found on Stack Overflow that simply does not work....Blackness
Its almost as if git changed in the last 7 years, or that there might be more than one way for this problem to happen... ( Sorry )Bock
For the disappeared branch issue, see the solution below that uses 'git remote add ...' followed by 'git remote rm ...' which was the only thing that worked for me.Sextuple
I which I read the last part of usually you will never need to call git gc before. It's the first thing you are suggesting. Nevertheless, it's a good answer. Thanks.Plasma
B
772

All you need to do is

git fetch -p

It'll remove all your local branches which are remotely deleted.

If you are on git 1.8.5+ you can set this automatically

git config fetch.prune true

or

git config --global fetch.prune true
Bourbon answered 24/11, 2011 at 10:38 Comment(7)
This is what I was looking for as well - the question is describing a scenario more complicated than the common one.Photina
I'm looking for a way to delete local branches where the corresponding remote has been deleted, but this doesnt work for me. Any idea why?Yonatan
This removes the branches listed in remote/origin but doesn't delete local tracking branches, which is just as important.Untenable
@Cupcake Since you didn't roll back my first edit (which was fixing the incorrect information about Git 1.8.5+), you have now made this incorrect. My second edit was fixing what I put in that was incorrect, which is now there again (with your rollback). Please go ahead and roll back one more edit to have the original. Thanks.Cathrin
@Cathrin I double checked your last edit, and rolled back to it. The OP can rollback again if he doesn't like it. Thanks.Katonah
@Cathrin meh, just do whatever you want, I'm probably just being too anal ;)Katonah
I'd suggest git fetch -p --all if you have several remotesKilly
D
345
git push public :master

This would delete the remote branch named master as Kent Fredric has pointed out.

To list remote-tracking branches:

git branch -r

To delete a remote-tracking branch:

git branch -rd public/master
Davinadavine answered 2/7, 2009 at 2:47 Comment(8)
This helped me to remove a git-svn remote ghost branch.Beauteous
git branch -rd removed_remote/branch worked for me, while the git gc --prune=now was worthless.Acute
I've been able to use git prune without any issues, but my co-worker who forked our main repo **COULD ONLY ** use the git branch -rd public/master-style solution to clean his environment up.Dimenhydrinate
git branch -rd public/master was what I was missing. I had heroku/master and herkou/master ... lol woopsTransact
@rchampourlier Not 100% worthless - if your git repo is big, removing the unused branches can free a lot of disk space in some situations.Cornucopia
git branch -rd origin/<branchName> worked in my case.Sustenance
@Cornucopia he means it didn't work, hence worthless, not that the operation is not worth doing.Regorge
After all the variations I tried, the only thing that worked was git branch -rd origin/branch/name. ThanksUncircumcision
E
179

All you need to do is

$ git branch -rd origin/whatever 

It's that simple. There is no reason to call a gc here.

Evoy answered 7/7, 2011 at 20:59 Comment(6)
how do you "push" that delete to github?Salcedo
@Salcedo That's not what this question was about. This question was specifcally for situations when you have an invalid remote reference in the local repo, but that branch no longer exists on the remote server. The answer to your question is $ git push origin :whateverEvoy
Yes, if something happens on the remote repo where a branch is deleted, but you still have reference to that remote branch on your local machine, then you would need to do what I put in my original answer to clean it up.Evoy
If you have a big cleanup job (lots of dangling remotes), you could just delete all remote branches with something like git branch -rd $(git branch -r) then reestablish the valid ones by doing a fetch.Sable
My situation was that I had used git config -e to rename my remote. I renamed the remote mine to origin. Then, this was the solution that worked best for me: git branch -rd $(git branch -r | grep 'mine/')Colt
This is the actual and only solution to the OP questionGamez
I
76

git gc --prune=now is not what you want.

git remote prune public

or git remote prune origin # if thats the the remote source

is what you want

Individualist answered 8/6, 2010 at 18:18 Comment(1)
@Casey $ git gc # does like a defragment for the git files to speed up the respository $ git remote prune origin # will clean up the delete the stale remote branches that show up with "git branch -r | grep origin". Thats what the question is asking I believe. So, the commands are totally different.Individualist
M
33

The accepted answer didn't work for me when the ref was packed. This does however:

$ git remote add public http://anything.com/bogus.git
$ git remote rm public
Millet answered 12/1, 2011 at 4:21 Comment(3)
Worked for me. Regular git branch -d was not working,returned error that branch does not exists, because I removed origin called "original", that was created by mistake, directly in .git/config file.Dambro
This is the method I had to use to remove branches that were inadvertently omitted from my .git/config (which had to be rebuilt due to an unrelated corruption). It's too bad this answer was so far down the chain that I didn't notice it until at long last I found the solution and went to add it to the accepted answer!Sextuple
This is what I needed after using svn2git. There were a lot of remotes/svn/* branches. Had to create a bogus 'svn' remote first.Basketry
B
10

In my case I was trying to delete entries that were saved in .git/packed-refs. You can edit this plain text file and delete entries from it that git br -D doesn't know how to touch (At least in ver 1.7.9.5).

I found this solution here: https://mcmap.net/q/54982/-delete-broken-branch-in-git

Bartle answered 1/12, 2014 at 23:47 Comment(2)
wow, this helped me. My colleague tried, restart VS, Restart his computer nothing worked, he deleted his local repo and pull everything to get rid of this :)Wildlife
Today I leanred that this packed-refs file is created as part of git gc, when it packs your commits into a highly-compressed archive it also moved the references into a single plain text file, possibly for optimization purposes; I hope future versions of git can git br -D ... packed refs.Bartle
T
5
git push origin --delete <branch name>

Referenced from: http://www.gitguys.com/topics/adding-and-removing-remote-branches/

Twitter answered 2/10, 2014 at 18:28 Comment(0)
D
3

I had a similar problem. None of the answers helped. In my case, I had two removed remote repositories showing up permanently.

My last idea was to remove all references to it by hand.

Let's say the repository is called “Repo”. I did:

find .git -name Repo 

So, I deleted the corresponding files and directories from the .git folder (this folder could be found in your Rails app or on your computer https://mcmap.net/q/54983/-where-does-git-store-changes-in-rails).

Then I did:

grep Repo -r .git

This found some text files in which I removed the corresponding lines. Now, everything seems to be fine.

Usually, you should leave this job to git.

Distance answered 26/2, 2014 at 10:20 Comment(0)
A
3

I didn't know about git branch -rd, so the way I have solved issues like this for myself is to treat my repo as a remote repo and do a remote delete. git push . :refs/remotes/public/master. If the other ways don't work and you have some weird reference you want to get rid of, this raw way is surefire. It gives you the exact precision to remove (or create!) any kind of reference.

Alvita answered 8/5, 2015 at 23:14 Comment(0)
S
2

Only slightly related, but still might be helpful in the same situation as we had - we use a network file share for our remote repository. Last week things were working, this week we were getting the error "Remote origin did not advertise Ref for branch refs/heads/master. This Ref may not exist in the remote or may be hidden by permission settings"

But we believed nothing had been done to corrupt things. The NFS does snapshots so I reviewed each "previous version" and saw that three days ago, the size in MB of the repository had gone from 282MB to 33MB, and about 1,403 new files and 300 folders now existed. I queried my co-workers and one had tried to do a push that day - then cancelled it.

I used the NFS "Restore" functionality to restore it to just before that date and now everythings working fine again. I did try the prune previously, didnt seem to help. Maybe the harsher cleanups would have worked.

Hope this might help someone else one day!

Jay

Suilmann answered 13/1, 2017 at 18:37 Comment(0)
B
0

Not sure how I got into the mess, but my error message was slightly different:

> git remote
> git branch
  warning: ignoring broken ref refs/remotes/origin/HEAD
  * main
>

But I was able to fix it by slightly reinterpreting a fix from elsewhere on this page. By this I mean I substituted the keyword HEAD for the branch name in <remote>/<branch>. None of the other suggestions people mentioned had worked (gc, prune, etc.) so I was running out of ideas and hoping for the best. Anyway, it worked like a charm:

> git remote
> git branch -rd origin/HEAD Deleted remote-tracking branch origin/HEAD (was refs/remotes/origin/main).

> git branch
* main
>
Boldt answered 3/9, 2021 at 7:59 Comment(0)
I
0

I tried everything here and nothing worked. If all else fails, remove the offending branches from the text file '.git/packed-refs', then remove the offending branches from '.git\refs\remotes\origin<branchName>'

Indeterminate answered 3/11, 2021 at 12:32 Comment(0)

© 2022 - 2024 — McMap. All rights reserved.