Changes between Version 39 and Version 40 of SourceCodeGit

Timestamp:

Feb 10, 2014, 12:05:05 PM (11 years ago)

Author:

Bluefin Tuna

Comment:

FIxed some git tips

SourceCodeGit

@@ -49 +49 @@
 The 'clone' operation pulls down ~134 MiB of source and gives you a copy that you can modify and compile locally. However, you will not be able to push changes to the BOINC repository. For write access, see further below.
 
-Change to the directory 'boinc_repo'. Here you find the files corresponding to the 'remote master branch', the bleeding edge of development.
-
-Run `git status` to show that this is actually true:
+Change to the directory 'boinc_repo'. Here you find the files corresponding to the HEAD of the 'remote master branch', the bleeding edge of development. The fully navigable development history of the project can be found in the 'boinc_repo/.git' subdirectory.
+
+You can replace the files on your 'master branch' by files from older branches or older tags using the appropriate git command - without
+needing to contact the Git repository server again as all the history can be found under 'boinc_repo/.git'. This is called 'checking out'. 
+
+Run `git status` to see whether there are any changes relative to the HEAD of the 'remote master branch':
 
 {{{
@@ -59 +62 @@
 # On branch master
 nothing to commit, working directory clean
-
-# What's the most recent tag for the currently checked-out version?
-$ git describe --always --tag
-client_release/7.2/7.2.9
-}}}
-
-The fully navigable development history of the project can be found in the 'boinc_repo/.git' subdirectory.
-
-You can replace the files on your 'master branch' by files from older branches or older tags using the appropriate git command - without
-needing to contact the Git repository server again as all the history can be found under 'boinc_repo/.git'. This is called 'checking out'. 
+}}}
 
 == Tags & Branches ==
@@ -133 +127 @@
 === Development on the bleeding edge ===
 
-If you want to work on the remote 'master' branch, check it out locally: 
+If you want to work on the HEAD of the 'remote master branch', check it out locally: 
 
 {{{
@@ -141 +135 @@
 Actually this has already happened when you cloned the repository, so the above command is mainly useful if you want to go back to the remote master branch after you modified some files in a hasty fashion.
 
+What is the absolutely latest tag issued?
+
+{{{
+$ git describe --tags `git rev-list --tags --max-count=1`
+client_release/7.2/7.2.41
+}}}
+
+What's the most recent tag for the currently checked-out version?
+
+{{{
+$ git describe --always --tag
+client_release/7.2/7.2.4-2866-g6ff59ea
+}}}
+
+This means that the HEAD is based on 'client_release/7.2/7.2.4', with 2866 commits on top (I think).
+
+What are the differences between the HEAD and the latest tag issued?
+
+{{{
+$ git diff HEAD client_release/7.2/7.2.41 | wc -l
+271949
+}}}
+
+271949 lines have differences. Not bad.
+
+You may want to see the differences to file 'version.h':
+
+{{{
+$ git diff HEAD client_release/7.2/7.2.41 version.h | grep BOINC_VERSION_STRING
+-#define BOINC_VERSION_STRING "7.3.0"
++#define BOINC_VERSION_STRING "7.2.41"
+}}}
+
+Looks like the HEAD is an as-yet-untagged 7.3.0. The choice is yours ... what do you want to compile? You probably want something more stable.
+
 === Check out a specific tag for compilation ===
 
@@ -149 +178 @@
 git tag
 }}}
-to list all the visible tags. Note that the tags come in '''lexicographical order''', not in '''version order'''!
-
-If you want to sort them by version number:
+
+to list all the visible tags. Note that the tags come in '''lexicographical order''', not in '''version order'''! If you want to sort them by version number:
 
 {{{