On 01/03/2015 02:03, KI7MT wrote:
> Hi Aandro, Bill,
Hi Greg,
>
> I'm definitely *not* a Git expert, and this was just a crude check, but
> here's what I'm doing; if it's wrong, let me know what would be the
> correct / better way.
>
> -----
> GITSTATUS=$(git status -uno |awk 'FNR==2 {print $4}')
>
> if [[ $GITSTATUS == "up-to-date" ]]; then
> echo "Local Hamlib3 source is Up-To-Date"
> echo
> else
> echo "Hamlib3 updates available"
> git pull
> fi
> -----
OK, you are having the same issue as Sandro. With git you have the
repository locally and the local commands only query what is there. You
need to update the index (repository database) from my public repositroy
before you see any changes I have pushed. The 'git pull' command does
two things, (1) update the default parent repository index (origin) and
(2) merge any changes into the current branch. If you want to check if
there are any new changes in my public repository then you must update
your index first. That is done with the 'git fetch' command like:
$ git fetch origin
after that the 'git status' command will show any un-merged changes in
you current branch.
It may help to understand that git doesn't use any network commands when
referencing a remote repository, in this case that is not done until you
do 'get fetch origin' to update your index or 'git pull' to update and
merge.
http://stackoverflow.com/questions/2514270/how-to-check-for-changes-on-remote-origin-git-repository
may help as well.
I recommend some reading starting here: http://git-scm.com/doc
>
> 73's
> Greg, KI7MT
73
Bill
G4WJS.
>
> On 02/28/2015 04:31 PM, Bill Somerville wrote:
>> On 28/02/2015 23:22, Alessandro Gorobey wrote:
>>> Hi All,
>> Hi Sandro,
>>> I need a small help on JTSDK 2 and git.
>>>
>>> On Ubuntu 14 LTS run jtsdk and go to hamlib I read the follow:
>>>
>>> -------------------------------------------
>>> Building G4WJS Version of Hamlib3
>>> -------------------------------------------
>>>
>>> Checking Hamlib3 source tree
>>> Local Hamlib3 source is Up-To-Date
>>>
>>> Hamlib seems Ok, rebuild anyway [ Y/N ]:
>>>
>>> The question seems tell me that hamlibs is Up-To-Date.
>>> Avoid to compile hamlibs is good if there is no updates (this function
>>> is not present in windows)
>>> Now I exit from jtsdk and try some commands:
>>>
>>>
>>> sandro@p4:~/jtsdk/src/g4wjs-hamlib$ git log -1
>>> commit a2bbc1e860fa35ce6cc679eb927f553d9a033f4a
>>> Merge: 5ecc56a b543322
>>> Author: Bill Somerville <b...@classdesign.com>
>>> Date: Fri Feb 13 18:20:05 2015 +0000
>>>
>>> Merge branch 'ft8x7-unify' into integration
>>>
>>> Conflicts:
>>> yaesu/ft8x7.c
>>>
>>> sandro@p4:~/jtsdk/src/g4wjs-hamlib$ git status -uno
>>> On branch integration
>>> Your branch is up-to-date with 'origin/integration'.
>>>
>>> nothing to commit (use -u to show untracked files)
>> Try:
>>
>> $ git fetch origin
>>
>> before the above command to see changes in my public fork repository
>> before you pull them.
>>
>> It is quite possible that the changes you merge below were push by me
>> between the JTSDK2 check above and the pull below.
>>
>>> sandro@p4:~/jtsdk/src/g4wjs-hamlib$ git pull
>>> remote: Counting objects: 249, done.
>>> remote: Compressing objects: 100% (199/199), done.
>>> remote: Total 208 (delta 161), reused 9 (delta 9)
>>> Receiving objects: 100% (208/208), 33.01 KiB | 0 bytes/s, done.
>>> Resolving deltas: 100% (161/161), completed with 34 local objects.
>>> From git://git.code.sf.net/u/bsomervi/hamlib
>>> a2bbc1e..e9e7430 integration -> origin/integration
>>> + cc954fe...49a194a back-vfo-api -> origin/back-vfo-api (forced update)
>>> + b543322...30b2d9f ft8x7-unify -> origin/ft8x7-unify (forced update)
>>> 4a74db6..aa9ad54 kenwood_strncpy_error ->
>>> origin/kenwood_strncpy_error
>>> 5a57de1..1d41268 master -> origin/master
>>> Updating a2bbc1e..e9e7430
>>> Fast-forward
>>> kenwood/elecraft.c | 3 +-
>>> kenwood/flex6xxx.c | 4 +-
>>> kenwood/k2.c | 24 +-
>>> kenwood/k3.c | 18 +-
>>> kenwood/kenwood.c | 166 ++++++-------
>>> kenwood/kenwood.h | 9 +-
>>> kenwood/th.c | 146 +++++------
>>> kenwood/thd72.c | 6 +-
>>> kenwood/thf6a.c | 8 +-
>>> kenwood/thf7.c | 8 +-
>>> kenwood/thg71.c | 24 +-
>>> kenwood/tmd710.c | 19 +-
>>> kenwood/tmv7.c | 38 +--
>>> kenwood/transfox.c | 27 +-
>>> kenwood/ts140.c | 2 +-
>>> kenwood/ts2000.c | 63 +++--
>>> kenwood/ts480.c | 24 +-
>>> kenwood/ts570.c | 123 ++++------
>>> kenwood/ts680.c | 2 +-
>>> kenwood/ts850.c | 65 ++---
>>> kenwood/ts870s.c | 66 ++---
>>> kenwood/xg3.c | 12 +-
>>> lib/termios.c | 8 +-
>>> src/iofunc.c | 3 +
>>> tests/rigctl_parse.c | 15 ++
>>> yaesu/ft8x7.c | 677
>>> ++++++++++++++++++++++++++-------------------------
>>> 26 files changed, 744 insertions(+), 816 deletions(-)
>>> sandro@p4:~/jtsdk/src/g4wjs-hamlib$ git pull
>>> Already up-to-date.
>>> sandro@p4:~/jtsdk/src/g4wjs-hamlib$ git status -uno
>>> On branch integration
>>> Your branch is up-to-date with 'origin/integration'.
>>>
>>> nothing to commit (use -u to show untracked files)
>>> sandro@p4:~/jtsdk/src/g4wjs-hamlib$ git checkout integration
>>> Already on 'integration'
>>> Your branch is up-to-date with 'origin/integration'.
>>> sandro@p4:~/jtsdk/src/g4wjs-hamlib$ git log -1
>>> commit e9e7430710c8789f32d75b4ebdbc26a0ad10c8fa
>>> Merge: 7e47f18 30b2d9f
>>> Author: Bill Somerville <b...@classdesign.com>
>>> Date: Sat Feb 28 14:46:54 2015 +0000
>>>
>>> Merge branch 'ft8x7-unify' into integration
>>> sandro@p4:~/jtsdk/src/g4wjs-hamlib$
>>>
>>> So my questions is:
>>> Which is the best way to find if hamlibs are Up-To-Date ?
>>>
>>> 73
>>> Sandro
>>> IW3RAB
>> 73
>> Bill
>> G4WJS.
> ------------------------------------------------------------------------------
> Dive into the World of Parallel Programming The Go Parallel Website, sponsored
> by Intel and developed in partnership with Slashdot Media, is your hub for all
> things parallel software development, from weekly thought leadership blogs to
> news, videos, case studies, tutorials and more. Take a look and join the
> conversation now. http://goparallel.sourceforge.net/
> _______________________________________________
> wsjt-devel mailing list
> wsjt-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/wsjt-devel
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
