Git Questions

[rgleason]

I'm rusty or have forgotten. I am trying to compile Sean's changes to the new Particle addon to Grib_pi.

What I did:
git remote add seanocpn git://github.com/seandepagnier/OpenCPN.git
. Downloads and then shows all of Sean's branches and there is a master.
. One of the branches is for the particle plugin
git remote -v shows
. origin git://github.com/OpenCPN/OpenCPN.git (fetch)
. origin git://github.com/OpenCPN/OpenCPN.git (push)
. seanocpn git://github.com/seandepagnier/OpenCPN.git (fetch)
. seanocpn git://github.com/seandepagnier/OpenCPN.git (push)

Now to compile do I do a git checkout seanocpn and then compile?

[CarCode]

There are easy to use graphical user interfaces for git available like e.g. SourceTree: https://www.atlassian.com/software/sourcetree/overview

So you can forget the command line interface to git.

Gerhard

[rgleason]

Gerhard, thanks. Have downloaded and used it and am getting used to it. Not sure I can do all I want to do with it yet, but will let you know...I still have a lot to learn.

[rgleason]

Now I realize that the author has made a pull request, I can just merge that pull request from the github notices emails by running

git pull https://github.com/seandepagnier/OpenCPN master

for example. That should be easy!

However I was setting up a remote branch and check it out this manner:

git remote add seanocpn git://github.com/seandepagnier/OpenCPN.git

git remote 
      .  origin      <-- the main opencpn repositiory
      .  seanocpn  <--sean's version repository

git remote -v
      . origin git://github.com/OpenCPN/OpenCPN.git (fetch)
      . origin git://github.com/OpenCPN/OpenCPN.git (push)
      . seanocpn git://github.com/seandepagnier/OpenCPN.git (fetch)
      . seanocpn git://github.com/seandepagnier/OpenCPN.git (push)

git remote show seanocpn
      .  shows all the branches on seanocpn including the master

git branch -a
      * master
      remotes/origin/HEAD --> origin/master
           --several other remote/origin branches
      remotes/seanocpn/master  (and others)
           --we want to set this as our branch now

So now how would I checkout the remote and be able to compile it?
Would I make a new branch like this?

Syntax:

git checkout --track -b  <local branch>       <remote>/<tracked branch>

For my case:

git checkout  --track -b   ocpn-sean    seanocpn/master

So I tried it.

C:\..\opencpn-git\build>git checkout --track -b ocpn-sean       seanocpn/master
      Branch ocpn-sean set up to track remote branch master from       seanocpn.
      Switched to a new branch 'ocpn-sean'

C:\..\opencpn-git\build>cd ..
      
C:\..\opencpn-git>git branch
        master
      * ocpn-sean
        origin

Next I went back to opencpn-git\build and ran cmake and it compiled!
Do you think it compiled sean's code?

[rgleason]

To update the local from the remote you can use the shortname this way, but first check the branch out once it has been created.

git checkout ocpn-sean
git fetch ocpn-sean

git checkout ocpn-sean
git pull

Keep in mind that:
1. Remote branch "seanocpn" = git://github.com/seandepagnier/OpenCPN.git
2. New (local) branch name is "ocpn-sean"

Here are some good links about remotes
Git Remotes: Fun Commands You Can Use | GitGuys - GitGuys
Adding and Removing Remote Branches - Git Branch - Giguys - GitGuys
"Tracking Branches" And "Remote-Tracking Branches" | GitGuys - GitGuys
Creating a Shared Repository; Users Sharing The Repository | GitGuys - GitGuys
The Configuration File - "Branch" Section | GitGuys - GitGuys
The Configuration File - "remote" Section - Git Config - GitGuys - GitGuys
Git Remote Branches - TunnelsUP
Git - Remote Branches
git - the simple guide - no deep ****! Simple Guide