Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl

Commits:

1 changed file:

Changes:

  • bin/git-version.sh
    ... ... @@ -8,7 +8,7 @@ git-version.sh [-hfv]
    8 8
         -f    The version is printed as a C file #define expression.
    
    9 9
               Otherwise, the version is just printed to stdout
    
    10 10
     
    
    11
    -    -v    Use this as the version instead of using `git describe`, which
    
    11
    +    -v    Use this as the version instead of using 'git describe', which
    
    12 12
               is the default
    
    13 13
     
    
    14 14
     Determine the version of cmucl.  By
    
    ... ... @@ -40,7 +40,7 @@ else
    40 40
         # name as appropriate.  This is much more informative.  However,
    
    41 41
         # we have to remove everything before the first slash which
    
    42 42
         # contains things like "tag/" or "head/".
    
    43
    -    GIT_DESC="`(git describe --all --dirty || git describe 2>/dev/null)`"
    
    43
    +    GIT_DESC="`git describe --all --dirty || git describe 2>/dev/null`"
    
    44 44
         GIT_HASH="`echo ${GIT_DESC} | sed 's;^[^/]\+/;;' 2>/dev/null`"
    
    45 45
         BRANCH="`git rev-parse --abbrev-ref HEAD`*"
    
    46 46
     
    
    ... ... @@ -75,7 +75,7 @@ else
    75 75
     fi
    
    76 76
     
    
    77 77
     if [ -z "$FILE" ]; then
    
    78
    -    echo $DEFAULT_VERSION
    
    78
    +    echo "$DEFAULT_VERSION"
    
    79 79
     else
    
    80 80
         cat <<EOF
    
    81 81
     /*