Skip to contentSkip to conversation

splitting GIT repositories

OT Gary Thomas 2 participants 4 messages Sep 8, 2011 – Sep 20, 2011

lore
Share & tools
lore
#0 lore raw

Sorry for the off-topic question, but I'm sure that I'm not the only Poky user out there that has a similar dilemma.

When I started working with Poky (quite some years ago), I added my code/recipes/... to the Poky GIT tree locally. This let me keep my parts up to date with the global repository fairly easily. I've tried to keep things such that my changes are separated from the Poky master changes.

Now that the layering system is working well, and indeed I could move from pure Yocto/Poky to oe-core, I'd like to split my files away from the Poky tree I've been using. I'd also like to keep history, etc, for my code as I do this.

Is there some way to purge Poky master from my local tree? In other words, remove all the Yocto/Poky files & directories, including any history/commits/etc that go along with them?

I've experimented some with clone + filter-branch which does strip away the parts I don't want, but the history is cluttered with Poky mainline commits. In the end, I'd like to end up with just my files and the commits that created them.

Thanks for any pointers or ideas

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#1 lore raw
Quoted 14 lines · Gary Thomas

Sorry for the off-topic question, but I'm sure that I'm not the only Poky user out there that has a similar dilemma.

When I started working with Poky (quite some years ago), I added my code/recipes/... to the Poky GIT tree locally.  This let me keep my parts up to date with the global repository fairly easily. I've tried to keep things such that my changes are separated from the Poky master changes.

Now that the layering system is working well, and indeed I could move from pure Yocto/Poky to oe-core, I'd like to split my files away from the Poky tree I've been using.  I'd also like to keep history, etc, for my code as I do this.

Quoted 8 lines

Is there some way to purge Poky master from my local tree?  In other words, remove all the Yocto/Poky files & directories, including any history/commits/etc that go along with them?

I've experimented some with clone + filter-branch which does strip away the parts I don't want, but the history is cluttered with Poky mainline commits.  In the end, I'd like to end up with just my files and the commits that created them.

Make sure you pass --prune-empty to your filter-branch command. Unless all your files are within a particular subdirectory (in which case you can use subdirectory-filter), you may want to use an index-filter with git rm --cached of the files you don't care about (perhaps by using ls-files and grepping out the paths you know you care about).

Signature · 5 lines
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
#2 lore raw
Quoted 24 lines · Chris Larson
Quoted 14 lines · Gary Thomas

Sorry for the off-topic question, but I'm sure that I'm not the only Poky user out there that has a similar dilemma.

When I started working with Poky (quite some years ago), I added my code/recipes/... to the Poky GIT tree locally. This let me keep my parts up to date with the global repository fairly easily. I've tried to keep things such that my changes are separated from the Poky master changes.

Now that the layering system is working well, and indeed I could move from pure Yocto/Poky to oe-core, I'd like to split my files away from the Poky tree I've been using. I'd also like to keep history, etc, for my code as I do this.

Quoted 8 lines

Is there some way to purge Poky master from my local tree? In other words, remove all the Yocto/Poky files& directories, including any history/commits/etc that go along with them?

I've experimented some with clone + filter-branch which does strip away the parts I don't want, but the history is cluttered with Poky mainline commits. In the end, I'd like to end up with just my files and the commits that created them.

Quoted 5 lines

Make sure you pass --prune-empty to your filter-branch command. Unless all your files are within a particular subdirectory (in which case you can use subdirectory-filter), you may want to use an index-filter with git rm --cached of the files you don't care about (perhaps by using ls-files and grepping out the paths you know you care about).

Could you give an example of this black magic? I've read through the GIT man pages and they are quite terse.

I did try this using subdirectory-filter and it kept only the files I wanted but when I ran 'gitk --all', the history still went back to day 1 of the Poky tree.

Thanks for your help

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#3 lore raw
Quoted 31 lines · Gary Thomas
Quoted 24 lines · Chris Larson
Quoted 14 lines · Gary Thomas

Sorry for the off-topic question, but I'm sure that I'm not the only Poky user out there that has a similar dilemma.

When I started working with Poky (quite some years ago), I added my code/recipes/... to the Poky GIT tree locally. This let me keep my parts up to date with the global repository fairly easily. I've tried to keep things such that my changes are separated from the Poky master changes.

Now that the layering system is working well, and indeed I could move from pure Yocto/Poky to oe-core, I'd like to split my files away from the Poky tree I've been using. I'd also like to keep history, etc, for my code as I do this.

Quoted 8 lines

Is there some way to purge Poky master from my local tree? In other words, remove all the Yocto/Poky files& directories, including any history/commits/etc that go along with them?

I've experimented some with clone + filter-branch which does strip away the parts I don't want, but the history is cluttered with Poky mainline commits. In the end, I'd like to end up with just my files and the commits that created them.

Quoted 5 lines

Make sure you pass --prune-empty to your filter-branch command. Unless all your files are within a particular subdirectory (in which case you can use subdirectory-filter), you may want to use an index-filter with git rm --cached of the files you don't care about (perhaps by using ls-files and grepping out the paths you know you care about).

Quoted 8 lines

Could you give an example of this black magic? I've read through the GIT man pages and they are quite terse.

I did try this using subdirectory-filter and it kept only the files I wanted but when I ran 'gitk --all', the history still went back to day 1 of the Poky tree.

Thanks for your help

BTW, I found this script: https://github.com/apenwarr/git-subtree/blob/master/git-subtree.txt

The 'split' function did exactly what I was looking for.

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------