blocks|key|1015755|text|嗯。通过在后续调用filter-branch时使用-f标志来覆盖该警告，从而强制覆盖备份。:)否则我认为您有解决方案(即用filter-branch一次清除一个不需要的目录)。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1015756|entityMap^0|9|D|P|2|1P|D|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|O|8|@]|D|@]|E|$]]]|G|$]]

Yeah. Force overwriting the backup by using the <code>-f</code> flag on subsequent calls to <code>filter-branch</code> to override that warning. :) Otherwise I think you have the solution (that is, eradicate an unwanted directory at a time with <code>filter-branch</code>).

blocks|key|1230490|text|为什么要多次运行filter-branch？您可以在一次扫描中完成所有操作，因此不需要强制执行(请注意，您需要在shell中启用extglob才能正常工作)：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1230491|git+filter-branch+--index-filter+"git+rm+-r+-f+--cached+--ignore-unmatch+$(ls+-xd+apps/!(AAA)+libs/!(XXX))"+--prune-empty+--+--all|code-block|syntax|javascript|1230492|这应该会消除不需要的子目录中的所有更改，并保留所有的分支和提交(除非它们只影响修剪子目录中的文件，由于--prune-empty)+-不会出现重复提交等问题。|1230493|执行此操作后，不需要的目录将被git+status列为未跟踪目录。|1230494|$(ls+...)是必需的s.t.外壳程序而不是索引过滤器对extglob求值，后者使用sh内置的eval+(其中extglob不可用)。有关这方面的更多详细信息，请参阅How+do+I+enable+shell+options+in+git?。|1230495|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/a/8079852/396967^0|8|D|1S|7|0|0|1F|D|0|F|A|0|0|9|U|7|18|2|1D|4|1L|7|2D|11|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@$9|Z|A|10|B|C]|$9|11|A|12|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|13|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|14|8|@$9|15|A|16|B|C]]|D|@]|E|$]]|$1|M|3|N|5|6|7|17|8|@$9|18|A|19|B|C]]|D|@]|E|$]]|$1|O|3|P|5|6|7|1A|8|@$9|1B|A|1C|B|C]|$9|1D|A|1E|B|C]|$9|1F|A|1G|B|C]|$9|1H|A|1I|B|C]|$9|1J|A|1K|B|C]]|D|@$9|1L|A|1M|1|1N]]|E|$]]|$1|Q|3|-4|5|6|7|1O|8|@]|D|@]|E|$]]]|R|$S|$5|T|U|V|E|$W|X]]]]

Why would you want to run <code>filter-branch</code> more than once? You can do it all in one sweep, so no need to force it (note that you need <code>extglob</code> enabled in your shell for this to work):

<pre><code>git filter-branch --index-filter "git rm -r -f --cached --ignore-unmatch $(ls -xd apps/!(AAA) libs/!(XXX))" --prune-empty -- --all
</code></pre>

This should get rid of all the changes in the unwanted subdirectories and keep all your branches and commits (unless they only affect files in the pruned subdirectories, by virtue of <code>--prune-empty</code>) - no issue with duplicate commits etc.

After this operation the unwanted directories will be listed as untracked by <code>git status</code>.

The <code>$(ls ...)</code> is necessary s.t. the <code>extglob</code> is evaluated by your shell instead of the index filter, which uses the <code>sh</code> builtin <code>eval</code> (where <code>extglob</code> is not available). See <a href="https://stackoverflow.com/a/8079852/396967">How do I enable shell options in git?</a> for further details on that.

blocks|key|1230577|text|我已经写了一个git过滤器来解决这个问题。它有一个很棒的名字叫git_filter，位于github上：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1230578|https://github.com/slobobaby/git_filter|offset|length|1230579|它是基于优秀的libgit2实现的。|1230580|我需要拆分一个包含多个提交(大约100000个)的大型存储库，而基于git+filter-branch的解决方案需要几天时间才能运行。git_filter需要一分钟来做同样的事情。|1230581|entityMap|0|LINK|mutability|MUTABLE|url^0|0|0|13|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|R|8|@]|9|@$D|S|E|T|1|U]]|A|$]]|$1|F|3|G|5|6|7|V|8|@]|9|@]|A|$]]|$1|H|3|I|5|6|7|W|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|X|8|@]|9|@]|A|$]]]|K|$L|$5|M|N|O|A|$P|C]]]]

I have writen a git filter to solve exactly this problem.
It has the fantastic name of git_filter and is located at github here:

<a href="https://github.com/slobobaby/git_filter" rel="noreferrer">https://github.com/slobobaby/git_filter</a>

It is based on the excellent libgit2.

I needed to split a large repository with many commits (~100000) and the solutions based on git filter-branch took several days to run. git_filter takes a minute to do the same thing.

blocks|key|1015941|text|按照消息建议，删除refs/original中的.git目录下的备份。该目录处于隐藏状态。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1015942|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Delete the backup present under the .git directory in refs/original like the message suggests. The directory is hidden.

blocks|key|1230658|text|git+clone+git@example.com:thing.git
cd+thing
git+fetch
for+originBranch+in+`git+branch+-r+%7C+grep+-v+master`;+do
++++branch=${originBranch:7:${#originBranch}}
++++git+checkout+$branch
done
git+checkout+master

git+filter-branch+--index-filter+'git+rm+--cached+-qr+--ignore-unmatch+--+.+&&+git+reset+-q+$GIT_COMMIT+--+dir1+dir2+.gitignore'+--prune-empty+--+--all

git+remote+set-url+origin+git@example.com:newthing.git
git+push+--all|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|1230659|unstyled|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|G|8|@]|9|@]|A|$B|C]]|$1|D|3|-4|5|E|7|H|8|@]|9|@]|A|$]]]|F|$]]

<pre><code>git clone git@example.com:thing.git
cd thing
git fetch
for originBranch in `git branch -r | grep -v master`; do
 branch=${originBranch:7:${#originBranch}}
 git checkout $branch
done
git checkout master

git filter-branch --index-filter 'git rm --cached -qr --ignore-unmatch -- . &amp;&amp; git reset -q $GIT_COMMIT -- dir1 dir2 .gitignore' --prune-empty -- --all

git remote set-url origin git@example.com:newthing.git
git push --all
</code></pre>

This question is based on <a href="https://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository">Detach subdirectory into separate Git repository</a> 

Instead of detaching a single subdirectory, I want to detach a couple. For example, my current directory tree looks like this:

<pre><code>/apps
 /AAA
 /BBB
 /CCC
/libs
 /XXX
 /YYY
 /ZZZ
</code></pre>

And I would like this instead:

<pre><code>/apps
 /AAA
/libs
 /XXX
</code></pre>

The <code>--subdirectory-filter</code> argument to <code>git filter-branch</code> won't work because it gets rid of everything except for the given directory the first time it's run. I thought using the <code>--index-filter</code> argument for all unwanted files would work (albeit tedious), but if I try running it more than once, I get the following message:

<pre><code>Cannot create a new backup.
A previous backup already exists in refs/original/
Force overwriting the backup with -f
</code></pre>

Any ideas? TIA

Detach many subdirectories into a new, separate Git repository

此问题基于我想要分离两个子目录，而不是分离单个子目录。例如，我的当前目录树如下所示：/apps  /AAA  /BBB  /CCC/libs  /XXX  /YYY  /ZZZ我希望是这样的：/apps  /AAA/libs  /XXXgit filter-branch的--subdirectory-filter参数将...

问将许多子目录分离到一个新的、独立的Git存储库中
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问将许多子目录分离到一个新的、独立的Git存储库中EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问将许多子目录分离到一个新的、独立的Git存储库中
EN