git remote prune – didn't show as many pruned branches as I expected
GitVersion ControlBranchGit BranchGit RemoteGit Problem Overview
From the man page:
> Deletes all stale tracking branches under
So I removed a bunch of branches using
git push origin :staleStuff
and then ran
git remote prune origin
However, only one single local branch was pruned. Some of these branches were created by me, some by co-workers. Does this indicate that I wasn't tracking those branches correctly in the first place?
Git Solutions
Solution 1 - Git
When you use git push origin :staleStuff
, it automatically removes origin/staleStuff
, so when you ran git remote prune origin
, you have pruned some branch that was removed by someone else. It's more likely that your co-workers now need to run git prune
to get rid of branches you have removed.
So what exactly git remote prune
does? Main idea: local branches (not tracking branches) are not touched by git remote prune
command and should be removed manually.
Now, a real-world example for better understanding:
You have a remote repository with 2 branches: master
and feature
. Let's assume that you are working on both branches, so as a result you have these references in your local repository (full reference names are given to avoid any confusion):
refs/heads/master
(short namemaster
)refs/heads/feature
(short namefeature
)refs/remotes/origin/master
(short nameorigin/master
)refs/remotes/origin/feature
(short nameorigin/feature
)
Now, a typical scenario:
- Some other developer finishes all work on the
feature
, merges it intomaster
and removesfeature
branch from remote repository. - By default, when you do
git fetch
(orgit pull
), no references are removed from your local repository, so you still have all those 4 references. - You decide to clean them up, and run
git remote prune origin
. - git detects that
feature
branch no longer exists, sorefs/remotes/origin/feature
is a stale branch which should be removed. - Now you have 3 references, including
refs/heads/feature
, becausegit remote prune
does not remove anyrefs/heads/*
references.
It is possible to identify local branches, associated with remote tracking branches, by branch.<branch_name>.merge
configuration parameter. This parameter is not really required for anything to work (probably except git pull
), so it might be missing.
(updated with example & useful info from comments)