Difference between revisions of "VTK/Git"
(Added a link to the simple Git guide.)
(→Topic Stage: added how to check out a staged topic)
|Line 142:||Line 142:|
$ ssh email@example.com stage VTK merge ''topic-name''
$ ssh firstname.lastname@example.org stage VTK merge ''topic-name''
Revision as of 17:15, 14 October 2010
VTK version tracking and development is hosted by Git.
These instructions assume a command prompt is available with
git in the path.
See our Git download instructions for help installing Git.
One may clone the repository using git clone through the native
$ git clone git://vtk.org/VTK.git VTK
or through the (less efficient)
$ git clone http://vtk.org/VTK.git VTK
All further commands work inside the local copy of the repository created by the clone:
$ cd VTK
For VTKData the URLs are
At the time of this writing the repository has the following branches:
- master: Development (default)
- release: Release maintenance
- nightly-master: Follows master, updated at 01:00 UTC
- hooks: Local commit hooks (place in .git/hooks)
Release branches converted from CVS have been artificially merged into master. Actual releases have tags named by the release version number.
We provide here a brief introduction to VTK development with Git. See the Resources page for further information such as Git tutorials.
Quick Start Guide
If you would like to get up and running quickly, we recommend you follow the simple Git guide. It will guide you through getting your development environment setup, working on topic branches and merging your changes back into master.
We require all commits in VTK to record valid author/committer name and email information. Use git config to introduce yourself to Git:
$ git config --global user.name "Your Name" $ git config --global user.email "email@example.com"
Note that "Your Name" is your real name (e.g. "John Doe", not "jdoe"). While you're at it, optionally enable color output from Git commands:
$ git config --global color.ui auto
--global option stores the configuration settings in
~/.gitconfig in your home directory so that they apply to all repositories.
The hooks branch provides local commit hooks to be placed in
It is shared by many
See the general hooks information page to set up your local hooks.
We've chosen to approximate our previous CVS-based development workflow after the initial move to Git, at least while things get settled. The basic rule is to rebase your work on origin/master before pushing:
git fetch origin git rebase origin/master
git pull --rebase
The server will refuse your push if it contains any merges. Later we will move to a full branchy workflow based on topic branches.
We already provide support for topic branches and merges through the VTK Topic Stage described in the next section.
We provide a "VTK Topic Stage" repository to which developers may publish arbitrary topic branches and request automatic merges. To follow this workflow, you should have git version 1.7 or greater.
The topic stage URLs are
http://vtk.org/stage/VTK.git(clone, fetch, gitweb)
See our Topic Stage Workflow documentation for general instructions.
(Currently VTK does not have a next branch. Just skip that part of the instructions and merge directly to master.)
When accessing the VTK stage, one may optionally substitute
ssh firstname.lastname@example.org stage VTK ..."
ssh email@example.com stage <repo> ..."
in the ssh command-line interface.
|Stage Usage Summary|
$ git remote add stage git://vtk.org/stage/VTK.git $ git config remote.stage.pushurl firstname.lastname@example.org:stage/VTK.git
Fetch Staged Topics:
$ git fetch stage --prune
Create Local Topic:
$ git checkout -b topic-name origin/master $ edit files $ git commit
Stage Current Topic:
$ git push stage HEAD
Print Staged Topics:
$ ssh email@example.com stage VTK print
Merge Staged Topic:
$ ssh firstname.lastname@example.org stage VTK merge topic-name
Check out Staged Topic:
$ git pull stage topic-name
Note that the stage implementation is not VTK-specific and is used for other projects too. If the merge attempt conflicts it may print instructions for performing the merge manually. Ignore these instructions; you will not be able to push the merge commit directly. Instead, identify the commit that conflicts with yours, merge it into your topic locally, push the topic to the stage again, and then repeat the merge request.
The VTK repository is mirrored on github. Experimental branches that are not ready for staging can be published on github for review.
The first step in creating a github branch is to create an account on github and make a fork of http://github.com/Kitware/VTK. Since this fork will be a mirror of the VTK master, there is no need to clone it on your local machine. Instead, you will just want to set github as an alternative remote in your existing local copy of the VTK git repository.
To set github as an alternative remote, use the following commands:
|Github Usage Summary|
$ git remote add github git://github.com/yourname/VTK.git $ git config remote.github.pushurl email@example.com:yourname/VTK.git
Update the Remote:
# update from Kitware's master and push to github $ git pull $ git push github HEAD
Push Branch to Github:
$ git checkout -b some-branch github/master # edit files and commit changes $ git push github HEAD
The second step above should be done regularly on your master, in order to keep your github fork up-to-date with the VTK master. Do not use github's graphical interface for merging commits, it creates new commits by rebasing the commits you select against your VTK fork. These new commits will be very difficult to merge back into VTK master.
The checkout command in the third step will automatically set github as the default remote for the new branch, but you still must specify "github HEAD" when you push or else you will push to the github master branch, instead of pushing to a new github branch. Also, since it bases the branch on your github fork, you should perform step 2 before creating the branch to make sure that your fork is up-to-date. This is just a suggestion, as it is always possible to rebase or merge at a later time.
The default remotes for each of your branches are controlled by entries such as this in your .github/config file:
[branch "my-branch-name"] remote = github merge = refs/heads/my-branch-name
You can edit this file to make github the default remote and to set the remote branch name for your existing branches. Or you can always use "git push github HEAD" to push each branch to github, without changing the defaults.
Authorized developers may publish work directly to
vtk.org/VTK.git using Git's SSH protocol.
To request access, fill out the Kitware Password form.
See the push instructions for details.
For VTK, configure the push URL:
git config remote.origin.pushurl firstname.lastname@example.org:VTK.git
For VTKData, configure the push URL:
git config remote.origin.pushurl email@example.com:VTKData.git
The vtk.org repository has an
When someone tries to push changes to the repository it checks the commits as documented here.
Contributions of bug fixes and features are commonly produced by the community. Patches are a convenient method for managing such contributions.
One may send patches after subscribing to our mailing list:
See our patch instructions for details.
fatal: The remote end hung up unexpectedly
- If git push fails with "fatal: The remote end hung up unexpectedly", you probably forgot to set the push url with "git config" see #Pushing.
Restoring files locally
Q: "I cloned the VTK repository. Now I "rm -rf Hybrid". How do I get it back?"
A: git checkout Hybrid
Q: "I modified a file locally. I want to revert it."
A: git checkout myfile.cxx
Q: "I want to get rid of all local changes in this directory and start clean."
A: git checkout .
Additional information about Git may be obtained at sites listed here.