Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Elemental subtree #109

Merged
merged 4 commits into from
Nov 25, 2014
Merged

Add Elemental subtree #109

merged 4 commits into from
Nov 25, 2014

Conversation

justusc
Copy link
Member

@justusc justusc commented Nov 20, 2014

I have decided that git-submodules is probably not the right solution for us. The main disadvantage I found (after trying to write the documentation) is that it changes the workflow of everyone, requiring users to add extra flags or run additional commands. If someone forgets these extra flags, it has the potential to screw things up for everyone.

Instead, I propose we use git-subtree. The advantages of this approach are:

  • a simple clone will pull Elemental with MADNESS (no extra commands/flags require)
  • we don’t have to modify makefiles or configure scripts (e.g. uncompress tarballs or update submodules)
  • users do not need to learn or do anything new w.r.t. git commands
  • subtree does not add new metadata files like submodules doe (i.e. .gitmodule)
  • we can modify elemental files without maintaining a fork of Elemental
  • it works with older version of git

Updating Elemental with git-subtree is relatively simple.
$ git subtree pull --prefix=src/elemental --squash https://github.com/elemental/Elemental.git
$ git commit -a -m "Updated Elemental to "
$ git push
where is a branch, tag, or SHA. User only need to "git pull" to get the changes.

If we want to modify files in elemental, then we can do so as if they were any other file in MADNESS.

justusc added a commit that referenced this pull request Nov 25, 2014
@justusc justusc merged commit bf5142a into m-a-d-n-e-s-s:master Nov 25, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant