31–39 of 39 posts
If you want to know what the git subtree command is, see http://apenwarr.ca/log/?m=200904#30
Examples are at the bottom.
So, to avoid duplicate commits, you'd either have to rebase the main branch or squash the commits before adding it back to the subtree (and lose history)?
Earlier quoted context omitted.
Ever had an upstream gitsubmodule move or shut down? I can't go back 6 months in my SCM and rebuild exactly what I had because the repo is gone now. This is bad and against the concept of having an SCM in the first place. There is a horrible habit of people forking projects on github just so their submodule stay stable. It's broken.
> There is a horrible habit of people forking > projects on github just so their submodule > stay stable. It's broken. People are forking projects on github in that way because it's a quick, easy, cheap way to create a mirror/hosted copy of the repository they want to use. I don't see how this is an example of how git-submodule is broken. If you want to use someone else's code, that is under someone else's control in…
I've never used git in-the-large, which may be why I don't understand: Why must some other library/module be part of my project? Why not reference and maintain the external lib/mod externally? We've been doing that for decades. It seems a solved problem. Bringing an external library within the fold of your project feels like unnecessary coupling.
For instance because you have componentized your product into different repositories, use different combinations of the components in different projects, but are still actively developing many of them simultaneously on each of those projects. Having to build, deploy and fetch gems (or whatever other method of distribution your language uses) is cumbersome if development is still really active. I don't think you shoul…
Funny, I thought this was the beginning of an argument agreeing with me. :)
Earlier quoted context omitted.
Dependency control it is a solved problem. Which is why SVN has externals, Hg has hgsubs, and Git has submodules and now subtrees. This isn't a git-in-the-large problem, it's an almost-any-nontrivial-project problem. It only seems unnecessary 'till you've had it and tried to live without it. Bringing other libraries into my project is beneficial because then my build system is able to wrangle those just as easily as…
Sometimes when I'm at work I forget that not all languages have maven.
Earlier quoted context omitted.
> Git submodule is a mess and now a legacy of git. I hear this kind of thing all the time, but I don't understand why. I've never had any problem whatsoever with git submodule. Can you elaborate a bit on what you mean by this?
Off the top of my head: Ever tried removing a submodule? Why is there no git submodule rm? (No, "it's confusing" is not a valid argument.) If the pull fails (say, from the wrong protocol), you end up with a half-baked submodule. Impossible to move, impossible to remove, impossible to update unless you dive into the config. Misspell the folder you wanted the submodule in? That sucks. Go delete it from two separate loc…
1. https://github.com/byrongibson/scripts/blob/master/git-rm-su...
2. http://stackoverflow.com/questions/1260748/how-do-i-remove-a...
Earlier quoted context omitted.
> There is a horrible habit of people forking > projects on github just so their submodule > stay stable. It's broken. People are forking projects on github in that way because it's a quick, easy, cheap way to create a mirror/hosted copy of the repository they want to use. I don't see how this is an example of how git-submodule is broken. If you want to use someone else's code, that is under someone else's control in…
Sure. Why I explained the work around. Subtree includes the full history of the other project without work-arounds
I've never used git in-the-large, which may be why I don't understand: Why must some other library/module be part of my project? Why not reference and maintain the external lib/mod externally? We've been doing that for decades. It seems a solved problem. Bringing an external library within the fold of your project feels like unnecessary coupling.
Different versions of your code could rely on different versions of the library (e.g. you update your code to a newer version of the library.) So which version of the library you rely on also needs to be version-controlled.