Changes between Version 39 and Version 40 of SourceCodeGit


Ignore:
Timestamp:
Feb 10, 2014, 12:05:05 PM (10 years ago)
Author:
Bluefin Tuna
Comment:

FIxed some git tips

Legend:

Unmodified
Added
Removed
Modified
  • SourceCodeGit

    v39 v40  
    4949The '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.
    5050
    51 Change to the directory 'boinc_repo'. Here you find the files corresponding to the 'remote master branch', the bleeding edge of development.
    52 
    53 Run `git status` to show that this is actually true:
     51Change 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.
     52
     53You can replace the files on your 'master branch' by files from older branches or older tags using the appropriate git command - without
     54needing to contact the Git repository server again as all the history can be found under 'boinc_repo/.git'. This is called 'checking out'.
     55
     56Run `git status` to see whether there are any changes relative to the HEAD of the 'remote master branch':
    5457
    5558{{{
     
    5962# On branch master
    6063nothing to commit, working directory clean
    61 
    62 # What's the most recent tag for the currently checked-out version?
    63 $ git describe --always --tag
    64 client_release/7.2/7.2.9
    65 }}}
    66 
    67 The fully navigable development history of the project can be found in the 'boinc_repo/.git' subdirectory.
    68 
    69 You can replace the files on your 'master branch' by files from older branches or older tags using the appropriate git command - without
    70 needing to contact the Git repository server again as all the history can be found under 'boinc_repo/.git'. This is called 'checking out'.
     64}}}
    7165
    7266== Tags & Branches ==
     
    133127=== Development on the bleeding edge ===
    134128
    135 If you want to work on the remote 'master' branch, check it out locally:
     129If you want to work on the HEAD of the 'remote master branch', check it out locally:
    136130
    137131{{{
     
    141135Actually 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.
    142136
     137What is the absolutely latest tag issued?
     138
     139{{{
     140$ git describe --tags `git rev-list --tags --max-count=1`
     141client_release/7.2/7.2.41
     142}}}
     143
     144What's the most recent tag for the currently checked-out version?
     145
     146{{{
     147$ git describe --always --tag
     148client_release/7.2/7.2.4-2866-g6ff59ea
     149}}}
     150
     151This means that the HEAD is based on 'client_release/7.2/7.2.4', with 2866 commits on top (I think).
     152
     153What are the differences between the HEAD and the latest tag issued?
     154
     155{{{
     156$ git diff HEAD client_release/7.2/7.2.41 | wc -l
     157271949
     158}}}
     159
     160271949 lines have differences. Not bad.
     161
     162You may want to see the differences to file 'version.h':
     163
     164{{{
     165$ git diff HEAD client_release/7.2/7.2.41 version.h | grep BOINC_VERSION_STRING
     166-#define BOINC_VERSION_STRING "7.3.0"
     167+#define BOINC_VERSION_STRING "7.2.41"
     168}}}
     169
     170Looks 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.
     171
    143172=== Check out a specific tag for compilation ===
    144173
     
    149178git tag
    150179}}}
    151 to list all the visible tags. Note that the tags come in '''lexicographical order''', not in '''version order'''!
    152 
    153 If you want to sort them by version number:
     180
     181to 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:
    154182
    155183{{{