Managing Condor Source Trees With Git

Not logged in

• Browse
• Help
• Home
• Login
• Reports
• Search
• Timeline
• Wiki

• Contents
• No-Diff
• Text

 {code}
 $ git branch -D V7_1_4
 {endcode}
-
-{section: Adding new externals to CONDOR_EXT.git}
-
-Adding externals to the git repository is the same as for CVS, described in {link: https://www.cs.wisc.edu/condor/developers/GENERIC/HOWTO-add-externals.html HOWTO-add-externals}, up to the "Adding it to the appropriate CVS modules" section. Most of the same concepts that existed in the CVS externals repository exist in the git one. The externals are not merged and live primarily on the TRUNK, in git the "master" branch. The difference between the way externals are managed in CVS and in git is how the externals are "branched." In CVS, "branches" were handled as modules in the CVSROOT/modules file, with =V7_1_EXT= acting as a filter on the full set of externals available in the TRUNK. In git, while all externals should always live on the master branch, subsets of the externals will live on actual branches in the repository, as such the V7_1-branch will be analogous to =V7_1_EXT= from CVS.
-
-First, you are going to be committing your new external to the =master= branch in the =CONDOR_EXT.git= repository. You'll want to make sure you are on that branch by running =git branch= and looking for the =*=. You should go through your normal steps to commit the new external, but you should make an extra effort to commit it all at once. The benefit to committing it all at once is moving the external to a specific branch will be simpler.
-
-{code}
-# Check to make sure you are on the master branch and that the
-# V7_1-branch is avialable
-$ git status
-* master
-
-# If you don't see V7_1-branch, you must have forgotten to create it
-# earler, do so now
-$ git branch V7_1-branch origin/V7_1-branch
-Branch V7_1-branch set up to track remote branch refs/remotes/origin/V7_1-branch.
-
-$ git branch
-  V7_1-branch
-* master
-
-# Now create your external...
-$ mkdir -p externals/bundles/myext/1.0
-$ emacs externals/bundles/myext/1.0/build_myext-1.0
-$ cp ... externals/bundles/myext/1.0/myext-1.0.tar.gz
-
-# Tell git about the external
-$ git add externals/bundles/myext
-
-$ git status
-# On branch master
-# Changes to be committed:
-#   (use "git reset HEAD <file>..." to unstage)
-#
-#       new file:   externals/bundles/myext/1.0/build_myext-1.0
-#       new file:   externals/bundles/myext/1.0/myext-1.0.tar.gz
-#
-
-# Commit your external all at once. Of course, you've already run it
-# through NMI. Make note of the id of the commit that was created,
-# here it is 5448f19
-$ git commit -a -m "New myext 1.0 used on V7_1"
-Created commit 5448f19: New myext 1.0 used on V7_1
- 0 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 externals/bundles/myext/1.0/build_myext-1.0
- create mode 100644 externals/bundles/myext/1.0/myext-1.0.tar.gz
-{endcode}
-
-Second, you want to put your external on either the stable or development branches. This step is analogous to the editing of =CVSROOT/modules= in the old CVS repository. To do this you will merge the commit you made to the master branch into the =V7_1-branch=. If you had to make multiple commits to create your external on the master branch then you'll have to do multiple merges.
-
-{code}
-# Change over to the V7_1-branch
-$ git checkout V7_1-branch
-Switched to branch "V7_1-branch"
-
-# Cherry-pick the commit you made on the master branch into the V7_1-branch
-$ git cherry-pick 5448f19
-Finished one cherry-pick.
-Created commit 6ce728b: New myext 1.0 used on V7_1
- 0 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 externals/bundles/myext/1.0/build_myext-1.0
- create mode 100644 externals/bundles/myext/1.0/myext-1.0.tar.gz
-{endcode}
-
-That is it. Just like with the CVS externals repository all externals will live on the "TRUNK", and instead of keeping track of externals via a CVS modules file you keep them on branches.
-
-Did you remember to push your changes to the central repository?
-
-{code}
-# Push all your changes to the central repository
-$ git push
-updating 'refs/heads/V7_1-branch'
-  from 988406a1c51bc089d501563acd7438336a073245
-  to   5448f1913bb4486771fa015f83f479b228dc630b
- Also local refs/remotes/origin/V7_1-branch
-updating 'refs/heads/master'
-  from 988406a1c51bc089d501563acd7438336a073245
-  to   5448f1913bb4486771fa015f83f479b228dc630b
- Also local refs/remotes/origin/master
-Generating pack...
-Done counting 6 objects.
-Deltifying 6 objects...
- 100% (6/6) done
-Writing 6 objects...
- 100% (6/6) done
-Total 6 (delta 0), reused 0 (delta 0)
-Unpacking 6 objects...
- 100% (6/6) done
-refs/heads/V7_1-branch: 988406a1c51bc089d501563acd7438336a073245 -> 5448f1913bb4486771fa015f83f479b228dc630b
-refs/heads/master: 988406a1c51bc089d501563acd7438336a073245 -> 5448f1913bb4486771fa015f83f479b228dc630b
-{endcode}
-
-If you later need to remove an external you should only do it from the branch that it is used on. There should be no need to remove it from the master branch. Removing it is an =rm=.
-
-{code}
-$ git branch
-* V7_1-branch
-  master
-
-$ rm -rf externals/bundles/myext/1.0
-
-$ git status
-# On branch V7_1-branch
-# Changed but not updated:
-#   (use "git add/rm <file>..." to update what will be committed)
-#
-#       deleted:    externals/bundles/myext/1.0/build_myext-1.0
-#       deleted:    externals/bundles/myext/1.0/myext-1.0.tar.gz
-#
-no changes added to commit (use "git add" and/or "git commit -a")
-
-$ git commit -a -m "Removed myext 1.0"
-Created commit 984ee88: Removed myext 1.0
- 0 files changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 externals/bundles/myext/1.0/build_myext-1.0
- delete mode 100644 externals/bundles/myext/1.0/myext-1.0.tar.gz
-
-$ git push
-updating 'refs/heads/V7_1-branch'
-  from 5448f1913bb4486771fa015f83f479b228dc630b
-  to   984ee883127ab78264d9c5689e82d11371836049
- Also local refs/remotes/origin/V7_1-branch
-Generating pack...
-Done counting 3 objects.
-Deltifying 3 objects...
- 100% (3/3) done
-Writing 3 objects...
- 100% (3/3) done
-Total 3 (delta 0), reused 0 (delta 0)
-Unpacking 3 objects...
- 100% (3/3) done
-refs/heads/V7_1-branch: 5448f1913bb4486771fa015f83f479b228dc630b -> 984ee883127ab78264d9c5689e82d11371836049
-{endcode}
-
-Oh, life can be even easier if your external was only ever added in a single commit, i.e. you didn't modify it after checking it in. You can simply revert the commit that added your external.
-
-{code}
-$ git revert --no-edit 5448f19
-Removed externals/bundles/myext/1.0/build_myext-1.0
-Removed externals/bundles/myext/1.0/myext-1.0.tar.gz
-Finished one revert.
-Created commit 37fcad0: Revert "New myext 1.0 used on V7_1"
- 0 files changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 externals/bundles/myext/1.0/build_myext-1.0
- delete mode 100644 externals/bundles/myext/1.0/myext-1.0.tar.gz
-
-$ git push
-{endcode}
-
-Done.

This work is supported by NSF under Cooperative Agreement OAC-2030508 as part of the PATh Project. Any opinions, findings, and conclusions or recommendations expressed in this material are those of the author(s) and do not necessarily reflect the views of the NSF. Site built using CVSTrac.