...
Working in home workspace on AFS
Code Block |
---|
[sgess@lclssgess@rhel6-dev364a ~/sgess/git_work/matlab2020a ]$ vim README.md [sgess@lclssgess@rhel6-dev364a ~/sgess/git_work/matlab2020a ]$ git commit -m "test commit from AFS" README.md [master c2cb0c2] test commit from AFS 1 files changed, 2 insertions(+), 0 deletions(-) [sgess@lclssgess@rhel6-dev364a ~/sgess/git_work/matlab2020a ]$ git push origin master Counting objects: 5, done. Delta compression using up to 40 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 333 bytes, done. Total 3 (delta 0), reused 0 (delta 0) To /afs/slac/g/cd/swe/git/repos/slac/FACET/matlab2020a.git ffd224e..c2cb0c2 master -> master |
...
Code Block |
---|
[fphysics@facet-srv01 ~/sgess/git_work/matlab2020a ]$ cd /usr/local/facet/tools/matlab2020a/ [fphysics@facet-srv01 /usr/local/facet/tools/matlab2020a ]$ git pull sgess@mcclogin's password: remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From ssh:///afs/slac/g/cd/swe/git/repos/slac/FACET/matlab2020a c2cb0c2..4cb81f7 master -> origin/master Updating c2cb0c2..4cb81f7 Fast-forward README.md | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(- |
Git Etiquette
General Git workflow to push changes to central repo: add, commit, fetch*, pull, push
(
*git fetch isoptional, but recommended in the event of multiple developers working in the same repo. Via StackOverflow:
git fetch
updates your local copy of the repository but does not modify any files in the working directory. It simply makes sure that the cached info it has about the repository you fetched is up-to-date. (If other people created new branches or added some commits since the last time you fetched, git will learn about them.)git pull
is shorthand forgit fetch
followed bygit merge FETCH_HEAD
. That is, it runsgit fetch
and then merges the changes from the remote repository into your current branch and working directory.Code Block [sgess@rhel6-64a ~/sgess/git_work/matlab2020a ]$ vim README.md [sgess@rhel6-64a ~/sgess/git_work/matlab2020a ]$ git add README.md [sgess@rhel6-64a ~/sgess/git_work/matlab2020a ]$ git commit -m "example of typical git workflow" [sgess@rhel6-64a ~/sgess/git_work/matlab2020a ]$ git fetch origin [sgess@rhel6-64a ~/sgess/git_work/matlab2020a ]$ git pull origin master [sgess@rhel6-64a ~/sgess/git_work/matlab2020a ]$ git push origin master
- It is good practice to specify the remote repo and branch (e.g., git push/pull origin master), particularly in case there are multiple branches in a repo.
- Leaving helpful descriptions of changes, bug fixes, etc. is strongly encouraged in your commitscommit messages.
When releasing a new repo to the production release area, the remote repo should be specified with the `ssh://` protocol. This will ensure that other FACET-II shared account users (fsoftegr/fphysics) will be able to access the repo and make changes. E.g.:
Code Block [fphysics@facet-srv01 /usr/local/facet/tools/matlab2020a ]$ git clone ssh:///afs/slac/g/cd/swe/git/repos/slac/FACET/matlab2020a/my_new_repo.git [fphysics@facet-srv01 /usr/local/facet/tools/matlab2020a ]$ cd my_new_repo && git remote -v origin ssh:///afs/slac/g/cd/swe/git/repos/slac/FACET/matlab2020a/my_new_repo.git (fetch) origin ssh:///afs/slac/g/cd/swe/git/repos/slac/FACET/matlab2020a/my_new_repo.git (push)
- You may work with repos hosted in cloud services such as GitHub/GitLab/etc, but when deploying code to production you must sync them to the master AFS repos as indicated above. This is typically done as follows:
1. Sync to local AFS workspace via internet accessible node (rhel6-64, lcls-dev3).
2. Push to AFS master repo (this can be done by setting different remote repos for fetching and pushing).
3. Proceed with releasing software to production as indicated above.
...