Difference between revisions of "How to work with the ImageJA submodule"

(Describe the submodule way to work with ImageJA (should be easier))
m (cd into ImageJA before working on it... ;-))
Line 15: Line 15:
 
Therefore, if you want to work on ImageJA's ''fiji'' branch, you need to create a local branch:
 
Therefore, if you want to work on ImageJA's ''fiji'' branch, you need to create a local branch:
  
 +
$ cd ImageJA/
 
  $ git checkout -b fiji origin/fiji
 
  $ git checkout -b fiji origin/fiji
  
Line 21: Line 22:
 
If you update the ImageJA submodule with "git submodule update ImageJA" on purpose or by accident, you will have to go back to the ''fiji'' branch before doing any work inside ImageJA:
 
If you update the ImageJA submodule with "git submodule update ImageJA" on purpose or by accident, you will have to go back to the ''fiji'' branch before doing any work inside ImageJA:
  
 +
$ cd ImageJA/
 
  $ git checkout fiji && git pull
 
  $ git checkout fiji && git pull
  
 
[[Category:Git]]
 
[[Category:Git]]

Revision as of 12:44, 13 June 2008

We have a modified ImageJ core that operates as Fiji's kernel. The source code is in a branch named 'fiji' in ImageJA repository.

Here is how to get fiji's ImageJA branch to run Fiji:

First check out the submodule ImageJA in fiji/:

$ git submodule init ImageJA
$ git submodule update ImageJA

Note: make sure that you have _no_ trailing slash after "ImageJA". In other words, "ImageJA/" will _not_ work.

Note: If the update finds a new revision to advance to, it will _detach_ the HEAD. That means that you will not be on any branch.

Therefore, if you want to work on ImageJA's fiji branch, you need to create a local branch:

$ cd ImageJA/
$ git checkout -b fiji origin/fiji

This only needs to be done once. You can now work with "git pull", "git add", "git commit" and "git push" to your heart's content.

If you update the ImageJA submodule with "git submodule update ImageJA" on purpose or by accident, you will have to go back to the fiji branch before doing any work inside ImageJA:

$ cd ImageJA/
$ git checkout fiji && git pull