RFC: use 'git subtree' instead of 'git submodules' #136
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Not yet working, and actually triggering a segfault
(This requires at least Rakudo 931d23d3 because it comes with lots of improvements on Match objects)
The last test actually fails right now, I suspect it's line 7 of Action.pm,
make hash ( $<pairlist>.ast )
Somehow that seems to return a Pair, not a Hash - and I haven't found ot why
|
PR #137 is the same as this one, but with 'git subtree add ... --squash', so that we don't pull in all the history from the three external projects. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git submoduleis very easy to set up, but shifts the responsibility of syncing it to the user -- hence thegit submodule initandgit submodule updatecalls inbootstrap.plandrebootstrap.pl.With this pull request,I'd like to discuss the possibility of moving to
git subtreeinstead. Compare http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/ for example. It presents the user a normal git repo, wheregit grep,git archiveetc work for the ext/ subdirs as usual. The commands for updating them are a bit more bulky, which is why I included a small helper script to update them.The large number of comits in this pull requests comes from importing the commits of the projects in ext/. If this is not desirable, I can import them as single commits (with
--squash).(An alternative to subtree would be https://github.com/ingydotnet/git-subrepo which maintains the meta data a bit more nicely, but isn't in git core, and comes with its own sets of tradeoffs.
So, what do you think?