blocks|key|293625|text|当您使用git+push+origin+:staleStuff时，它会自动删除origin/staleStuff，所以当您运行git+remote+prune+origin时，您已经修剪了一些被其他人删除的分支。更有可能的是，您的同事现在需要运行git+prune来删除您删除的分支。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|293626|293627|那么git+remote+prune到底做了什么呢？大意:本地分支(不是跟踪分支)不会被git+remote+prune命令触及，应该手动删除。|293628|现在，为了更好地理解，我们来看一个真实的例子：|293629|您有一个具有两个分支的远程存储库：master和feature。假设您正在处理这两个分支，因此您的本地存储库中有这些引用(为了避免混淆，会给出完整的引用名称)：|293630|293631|refs/heads/master+(short+name+master)|unordered-list-item|293632|refs/heads/feature+(short+name+feature)|293633|refs/remotes/origin/master+(short+name+origin/master)|293634|refs/remotes/origin/feature+(short+name+origin/feature)|293635|293636|现在，一个典型的场景：|293637|293638|一些其他开发人员完成了feature上的所有工作，将其合并到master中，并从远程repository.|ordered-list-item|293639|By默认情况下删除了feature分支，当您执行git+fetch+(或git+pull)时，没有从本地存储库中删除引用，因此您仍然让所有这4个a决定清理它们，并且运行git+remote+prune+origin.|293640|git检测到feature分支不再存在，因此refs/remotes/origin/feature是一个应该删除的陈旧分支。|293641|现在您有3个引用，包括refs/heads/feature，因为git+remote+prune不会删除任何refs/heads/*引用。|293642|293643|可以通过branch.<branch_name>.merge配置参数识别与远程跟踪分支相关联本地分支。这个参数实际上并不是工作所必需的(可能除了git+pull之外)，所以它可能会丢失。|293644|(根据示例和评论中的有用信息进行更新)|293645|entityMap^0|4|R|13|H|1R|N|3F|9|0|0|2|G|18|G|0|0|H|6|O|7|0|0|0|H|U|6|0|0|I|V|7|0|0|Q|13|D|0|0|R|14|E|0|0|0|0|B|7|U|6|0|A|7|O|9|10|8|2C|N|0|6|7|M|R|0|B|I|W|G|1I|C|0|0|4|Q|20|8|0|0^^$0|@$1|2|3|4|5|6|7|1G|8|@$9|1H|A|1I|B|C]|$9|1J|A|1K|B|C]|$9|1L|A|1M|B|C]|$9|1N|A|1O|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|1P|8|@]|D|@]|E|$]]|$1|G|3|H|5|6|7|1Q|8|@$9|1R|A|1S|B|C]|$9|1T|A|1U|B|C]]|D|@]|E|$]]|$1|I|3|J|5|6|7|1V|8|@]|D|@]|E|$]]|$1|K|3|L|5|6|7|1W|8|@$9|1X|A|1Y|B|C]|$9|1Z|A|20|B|C]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|21|8|@]|D|@]|E|$]]|$1|N|3|O|5|P|7|22|8|@$9|23|A|24|B|C]|$9|25|A|26|B|C]]|D|@]|E|$]]|$1|Q|3|R|5|P|7|27|8|@$9|28|A|29|B|C]|$9|2A|A|2B|B|C]]|D|@]|E|$]]|$1|S|3|T|5|P|7|2C|8|@$9|2D|A|2E|B|C]|$9|2F|A|2G|B|C]]|D|@]|E|$]]|$1|U|3|V|5|P|7|2H|8|@$9|2I|A|2J|B|C]|$9|2K|A|2L|B|C]]|D|@]|E|$]]|$1|W|3|-4|5|6|7|2M|8|@]|D|@]|E|$]]|$1|X|3|Y|5|6|7|2N|8|@]|D|@]|E|$]]|$1|Z|3|-4|5|6|7|2O|8|@]|D|@]|E|$]]|$1|10|3|11|5|12|7|2P|8|@$9|2Q|A|2R|B|C]|$9|2S|A|2T|B|C]]|D|@]|E|$]]|$1|13|3|14|5|12|7|2U|8|@$9|2V|A|2W|B|C]|$9|2X|A|2Y|B|C]|$9|2Z|A|30|B|C]|$9|31|A|32|B|C]]|D|@]|E|$]]|$1|15|3|16|5|12|7|33|8|@$9|34|A|35|B|C]|$9|36|A|37|B|C]]|D|@]|E|$]]|$1|17|3|18|5|12|7|38|8|@$9|39|A|3A|B|C]|$9|3B|A|3C|B|C]|$9|3D|A|3E|B|C]]|D|@]|E|$]]|$1|19|3|-4|5|6|7|3F|8|@]|D|@]|E|$]]|$1|1A|3|1B|5|6|7|3G|8|@$9|3H|A|3I|B|C]|$9|3J|A|3K|B|C]]|D|@]|E|$]]|$1|1C|3|1D|5|6|7|3L|8|@]|D|@]|E|$]]|$1|1E|3|-4|5|6|7|3M|8|@]|D|@]|E|$]]]|1F|$]]

When you use <code>git push origin :staleStuff</code>, it automatically removes <code>origin/staleStuff</code>, so when you ran <code>git remote prune origin</code>, you have pruned some branch that was removed by someone else. It's more likely that your co-workers now need to run <code>git prune</code> to get rid of branches you have removed.

<hr>

So what exactly <code>git remote prune</code> does? Main idea: local branches (not tracking branches) are not touched by <code>git remote prune</code> command and should be removed manually.

Now, a real-world example for better understanding:

You have a remote repository with 2 branches: <code>master</code> and <code>feature</code>. 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):

<ul>
<li><code>refs/heads/master</code> (short name <code>master</code>)</li>
<li><code>refs/heads/feature</code> (short name <code>feature</code>)</li>
<li><code>refs/remotes/origin/master</code> (short name <code>origin/master</code>)</li>
<li><code>refs/remotes/origin/feature</code> (short name <code>origin/feature</code>)</li>
</ul>

Now, a typical scenario:

<ol>
<li>Some other developer finishes all work on the <code>feature</code>, merges it into <code>master</code> and removes <code>feature</code> branch from remote repository.</li>
<li>By default, when you do <code>git fetch</code> (or <code>git pull</code>), no references are removed from your local repository, so you still have all those 4 references.</li>
<li>You decide to clean them up, and run <code>git remote prune origin</code>.</li>
<li>git detects that <code>feature</code> branch no longer exists, so <code>refs/remotes/origin/feature</code> is a stale branch which should be removed. </li>
<li>Now you have 3 references, including <code>refs/heads/feature</code>, because <code>git remote prune</code> does not remove any <code>refs/heads/*</code> references.</li>
</ol>

It is possible to identify local branches, associated with remote tracking branches, by <code>branch.&lt;branch_name&gt;.merge</code> configuration parameter. This parameter is not really required for anything to work (probably except <code>git pull</code>), so it might be missing.

(updated with example &amp; useful info from comments)

From the man page:

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

So I removed a bunch of branches using

<pre><code>git push origin :staleStuff
</code></pre>

and then ran

<pre><code>git remote prune origin
</code></pre>

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 remote prune – didn't show as many pruned branches as I expected

从手册页：删除下的所有陈旧跟踪分支。这些陈旧的分支已经从引用的远程存储库中删除，但仍然在"remotes/“中本地可用。所以我删除了一堆树枝git push origin :staleStuff然后跑git remote prune origin但是，只有一个本地分支被修剪。这些分支有些是我创建的，有些是同事创建的。这...

问git远程修剪-没有像我预期的那样显示修剪过的分支
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git远程修剪-没有像我预期的那样显示修剪过的分支EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git远程修剪-没有像我预期的那样显示修剪过的分支
EN