blocks|key|1040793|text|这就是当我自己解决这个问题时，我最终做的事情：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1040794|git+filter-branch+--index-filter+\
'git+ls-tree+--name-only+--full-tree+$GIT_COMMIT+%7C+\
+grep+-v+"%5Edirectory-to-keep$"+%7C+\
+sed+-e+"s/%5E/\"/g"+-e+"s/$/\"/g"+%7C+\
+xargs+git+rm+--cached+-r+-f+--ignore-unmatch+\
'+\
--prune-empty+--+--all|code-block|syntax|javascript|1040795|这个解决方案是基于Jefromi的回答和Detach+(move)+subdirectory+into+separate+Git+repository，再加上很多关于SO的评论。|offset|length|1040796|Jefromi的解决方案对我不起作用的原因是，我的存储库中有文件和文件夹的名称包含特殊字符(主要是空格)。此外，git+rm还抱怨不匹配的文件(使用--ignore-unmatch解决)。|style|CODE|1040797|您可以保持过滤对不在存储库的根目录中或被四处移动的目录的不可知性：|1040798|grep+--invert-match+"%5E.*directory-to-keep$"|1040799|最后，您可以使用它来筛选出文件或目录的固定子集：|1040800|egrep+--invert-match+"%5E(.*file-or-directory-to-keep-1$%7C.*file-or-directory-to-keep-2$%7C…)"|1040801|要在之后进行清理，可以使用以下命令：|1040802|$+git+reset+--hard
$+git+show-ref+refs/original/*+--hash+%7C+xargs+-n+1+git+update-ref+-d
$+git+reflog+expire+--expire=now+--all
$+git+gc+--aggressive+--prune=now|1040803|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository^0|0|0|K|1J|0|0|1K|6|22|G|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|18|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|19|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|1A|8|@]|9|@$I|1B|J|1C|1|1D]]|A|$]]|$1|K|3|L|5|6|7|1E|8|@$I|1F|J|1G|M|N]|$I|1H|J|1I|M|N]]|9|@]|A|$]]|$1|O|3|P|5|6|7|1J|8|@]|9|@]|A|$]]|$1|Q|3|R|5|D|7|1K|8|@]|9|@]|A|$E|F]]|$1|S|3|T|5|6|7|1L|8|@]|9|@]|A|$]]|$1|U|3|V|5|D|7|1M|8|@]|9|@]|A|$E|F]]|$1|W|3|X|5|6|7|1N|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|D|7|1O|8|@]|9|@]|A|$E|F]]|$1|10|3|-4|5|6|7|1P|8|@]|9|@]|A|$]]]|11|$12|$5|13|14|15|A|$16|17]]]]

This is what I ended up doing to solve this issue when I had it myself:

<pre><code>git filter-branch --index-filter \
'git ls-tree --name-only --full-tree $GIT_COMMIT | \
 grep -v "^directory-to-keep$" | \
 sed -e "s/^/\"/g" -e "s/$/\"/g" | \
 xargs git rm --cached -r -f --ignore-unmatch \
' \
--prune-empty -- --all
</code></pre>

The solution is based on Jefromi’s answer and on <a href="https://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository">Detach (move) subdirectory into separate Git repository</a> plus many comments here on SO.

The reason why Jefromi’s solution did not work for me was, that I had files and folders in my repo whose names contained special characters (mostly spaces). Additionally <code>git rm</code> complained about unmatched files (resolved with <code>--ignore-unmatch</code>).

You can keep the filtering agnostic to the directory not being in the repo’s root or being moved around:

<pre><code>grep --invert-match "^.*directory-to-keep$"
</code></pre>

And finally, you can use this to filter out a fixed subset of files or directories:

<pre><code>egrep --invert-match "^(.*file-or-directory-to-keep-1$|.*file-or-directory-to-keep-2$|…)"
</code></pre>

To clean up afterwards you can use these commands:

<pre><code>$ git reset --hard
$ git show-ref refs/original/* --hash | xargs -n 1 git update-ref -d
$ git reflog expire --expire=now --all
$ git gc --aggressive --prune=now
</code></pre>

blocks|key|1255765|text|我想做类似的事情，但是因为我想保留的文件列表很长，所以使用无数grep来做这件事是没有意义的。我写了一个从文件中读取文件列表的脚本：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1255766|#!/bin/bash

#+usage:
#+git+filter-branch+--prune-empty+--index-filter+\
#+'this-script+file-with-list-of-files-to-be-kept'+--+--all

if+[+-z+$1+];+then
++++echo+"Too+few+arguments."
++++echo+"Please+specify+an+absolute+path+to+the+file"
++++echo+"which+contains+the+list+of+files+that+should"
++++echo+"remain+in+the+repository+after+filtering."
++++exit+1
fi

#+save+a+list+of+files+present+in+the+commit
#+which+is+currently+being+modified.
git+ls-tree+-r+--name-only+--full-tree+$GIT_COMMIT+>+files.txt

#+delete+all+files+that+shouldn't+be+removed
while+read+string;+do
++++grep+-v+"$string"+files.txt+>+files.txt.temp
++++mv+-f+files.txt.temp+files.txt
done+<+$1

#+remove+unwanted+files+(i.e.+everything+that+remained+in+the+list).
#+warning:+'git+rm'+will+exit+with+non-zero+status+if+it+gets
#+an+invalid+(non-existent)+filename+OR+if+it+gets+no+arguments.
#+If+something+exits+with+non-zero+status,+filter-branch+will+abort.
#+That's+why+we+have+to+check+carefully+what+is+passed+to+git+rm.
if+[+"$(cat+files.txt)"+!=+""+];+then
++++cat+files.txt+%7C+\
++++#+enclose+filenames+in+""+in+case+they+contain+spaces
++++sed+-e+'s/%5E/"/g'+-e+'s/$/"/g'+%7C+\
++++xargs+git+rm+--cached+--quiet
fi|code-block|syntax|javascript|1255767|令人惊讶的是，这项工作比我最初预期的要多得多，所以我决定把它贴在这里。|1255768|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

I wanted to do a similar thing, but since the list of files that i wanted to keep was pretty long, it didn't make sense to do this using countless greps. I wrote a script that reads the list of files from a file:

<pre><code>#!/bin/bash

# usage:
# git filter-branch --prune-empty --index-filter \
# 'this-script file-with-list-of-files-to-be-kept' -- --all

if [ -z $1 ]; then
 echo "Too few arguments."
 echo "Please specify an absolute path to the file"
 echo "which contains the list of files that should"
 echo "remain in the repository after filtering."
 exit 1
fi

# save a list of files present in the commit
# which is currently being modified.
git ls-tree -r --name-only --full-tree $GIT_COMMIT &gt; files.txt

# delete all files that shouldn't be removed
while read string; do
 grep -v "$string" files.txt &gt; files.txt.temp
 mv -f files.txt.temp files.txt
done &lt; $1

# remove unwanted files (i.e. everything that remained in the list).
# warning: 'git rm' will exit with non-zero status if it gets
# an invalid (non-existent) filename OR if it gets no arguments.
# If something exits with non-zero status, filter-branch will abort.
# That's why we have to check carefully what is passed to git rm.
if [ "$(cat files.txt)" != "" ]; then
 cat files.txt | \
 # enclose filenames in "" in case they contain spaces
 sed -e 's/^/"/g' -e 's/$/"/g' | \
 xargs git rm --cached --quiet
fi
</code></pre>

Quite suprisingly, this turned out to be much more work than i initially expected, so i decided to post it here.

blocks|key|1255779|text|一种更干净的方法：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1255780|git+filter-branch+--index-filter+'
++++++++++++++++git+read-tree+--empty
++++++++++++++++git+reset+$GIT_COMMIT+path/to/dir
++++++++'+\
++++++++--+--all+--+path/to/dir|code-block|syntax|javascript|1255781|或者只使用核心命令，在git+read-tree+--prefix=path/to/dir/+$GIT_COMMIT:path/to/dir中执行重置。|offset|length|style|CODE|1255782|在rev-list+args上指定path/to/dir可以提前进行修剪，使用这么便宜的过滤器并不重要，但无论如何都可以避免浪费精力。|1255783|entityMap^0|0|0|B|1N|0|H|B|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|V|8|@$I|W|J|X|K|L]]|9|@]|A|$]]|$1|O|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|P|$]]

A cleaner method:

<pre><code>git filter-branch --index-filter '
 git read-tree --empty
 git reset $GIT_COMMIT path/to/dir
 ' \
 -- --all -- path/to/dir
</code></pre>

or to stick with just core commands, sub in <code>git read-tree --prefix=path/to/dir/ $GIT_COMMIT:path/to/dir</code> for the reset.

Specifying <code>path/to/dir</code> on the rev-list args does the pruning early, with a filter this cheap it doesn't matter much but it's good to avoid the wasted effort anyway.

blocks|key|1040887|text|如果您希望将单个目录拆分为单独的git存储库|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1040888|git-filter-branch有--subdirectory-filter选项，它比前面提到的解决方案简单得多，只是：|offset|length|style|CODE|1040889|git+filter-branch+--subdirectory-filter+foodir+--+--all|code-block|syntax|javascript|1040890|此外，它还会更改路径并将目录内容放在新存储库的顶部，而不仅仅是过滤和删除其他内容。|1040891|entityMap|0|LINK|mutability|MUTABLE|url|https://git-scm.com/docs/git-filter-branch^0|0|I|L|0|H|0|0|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|X|8|@$D|Y|E|Z|F|G]]|9|@$D|10|E|11|1|12]]|A|$]]|$1|H|3|I|5|J|7|13|8|@]|9|@]|A|$K|L]]|$1|M|3|N|5|6|7|14|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|15|8|@]|9|@]|A|$]]]|P|$Q|$5|R|S|T|A|$U|V]]]]

If you wish split out just single directory as separate git repository 

<a href="https://git-scm.com/docs/git-filter-branch" rel="nofollow noreferrer">git-filter-branch</a> has <code>--subdirectory-filter</code> option and it is much simpler then previous mentioned solutions, just:

<pre><code>git filter-branch --subdirectory-filter foodir -- --all
</code></pre>

Additionally it change path and place content of directory on top of new repo, not just filter and remove other content.

blocks|key|1040929|text|我在filename-callback中使用了git-filter-repo。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1040930|stephen@B450-AORUS-M:~/source/linux$+git+filter-repo+--force+--filename-callback+'
++if+b"it87.c"+in+filename:
++++return+filename
++else:
++++#+Keep+the+filename+and+do+not+rename+it
++++return+None
++'
warning:+Tag+points+to+object+of+unexpected+type+tree,+skipping.
warning:+Tag+points+to+object+of+unexpected+type+tree,+skipping.
Parsed+935794+commitswarning:+Omitting+tag+5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c,
since+tags+of+trees+(or+tags+of+tags+of+trees,+etc.)+are+not+supported.
warning:+Omitting+tag+5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c,
since+tags+of+trees+(or+tags+of+tags+of+trees,+etc.)+are+not+supported.
Parsed+937142+commits
New+history+written+in+177.03+seconds;+now+repacking/cleaning...
Repacking+your+repo+and+cleaning+out+old+unneeded+objects
HEAD+is+now+at+a57e6edb85a3+treewide:+Replace+GPLv2+boilerplate/reference+with+SPDX+-+rule+157
Enumerating+objects:+20210,+done.
Counting+objects:+100%25+(20210/20210),+done.
Delta+compression+using+up+to+12+threads
Compressing+objects:+100%25+(17718/17718),+done.
Writing+objects:+100%25+(20210/20210),+done.
Total+20210+(delta+1841),+reused+20038+(delta+1669),+pack-reused+0
Completely+finished+after+179.76+seconds.|code-block|syntax|javascript|1040931|它没有删除空的合并提交，可能是因为有一堆标签与树的一侧相关联。|1040932|我试着使用投票最多的答案，它似乎没有删除任何东西，并花费了很长时间。|1040933|Rewrite+3e80e1395bd4f410b79dc0f17113f5b6b409c7d8+(329/937142)+(8+seconds+passed,+remaining+22779+predicted)|1040934|22779秒=+6.3275小时|1040935|entityMap^0|2|H|N|F|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|U|8|@$9|V|A|W|B|C]|$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|Z|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|10|8|@]|D|@]|E|$]]|$1|M|3|N|5|6|7|11|8|@]|D|@]|E|$]]|$1|O|3|P|5|H|7|12|8|@]|D|@]|E|$I|J]]|$1|Q|3|R|5|6|7|13|8|@]|D|@]|E|$]]|$1|S|3|-4|5|6|7|14|8|@]|D|@]|E|$]]]|T|$]]

I used <code>git-filter-repo</code> with <code>filename-callback</code>.
<pre><code>stephen@B450-AORUS-M:~/source/linux$ git filter-repo --force --filename-callback '
 if b&quot;it87.c&quot; in filename:
 return filename
 else:
 # Keep the filename and do not rename it
 return None
 '
warning: Tag points to object of unexpected type tree, skipping.
warning: Tag points to object of unexpected type tree, skipping.
Parsed 935794 commitswarning: Omitting tag 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c,
since tags of trees (or tags of tags of trees, etc.) are not supported.
warning: Omitting tag 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c,
since tags of trees (or tags of tags of trees, etc.) are not supported.
Parsed 937142 commits
New history written in 177.03 seconds; now repacking/cleaning...
Repacking your repo and cleaning out old unneeded objects
HEAD is now at a57e6edb85a3 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 157
Enumerating objects: 20210, done.
Counting objects: 100% (20210/20210), done.
Delta compression using up to 12 threads
Compressing objects: 100% (17718/17718), done.
Writing objects: 100% (20210/20210), done.
Total 20210 (delta 1841), reused 20038 (delta 1669), pack-reused 0
Completely finished after 179.76 seconds.
</code></pre>
It didn't remove empty merge commits, probably due to a bunch of tags that were associated with one side of the tree.
I tried using the top most voted answer, and it didn't seem to remove anything, and took a long time.
<pre><code>Rewrite 3e80e1395bd4f410b79dc0f17113f5b6b409c7d8 (329/937142) (8 seconds passed, remaining 22779 predicted)
</code></pre>
22779 seconds = 6.3275 hours

What I want is similar to <a href="https://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository">this question</a>. However, I want the directory that is split into a separate repo to remain a subdirectory in that repo:

I have this:

<pre><code>foo/
 .git/
 bar/
 baz/
 qux/
</code></pre>

And I want to split it into two completely independent repositories:

<pre><code>foo/
 .git/
 bar/
 baz/

quux/
 .git/
 qux/ # Note: still a subdirectory
</code></pre>

How to do this in git?

I could use the method from <a href="https://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository/359759#359759">this answer</a> if there is some way to move all the new repo's contents into a subdirectory, throughout history.

How to split a git repository while preserving subdirectories?

我想要的类似于。但是，我希望拆分成单独存储库的目录仍然是该存储库中的一个子目录：我有这个：foo/  .git/  bar/  baz/  qux/我想把它分成两个完全独立的存储库：foo/  .git/  bar/  baz/quux/  .git/  qux/  # Note: still a subdirecto...

问如何在保留子目录的同时拆分git存储库？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在保留子目录的同时拆分git存储库？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在保留子目录的同时拆分git存储库？
EN