Add branch name to commit ID (sha1)

This should give better hint if built from a feature branch

mkit/include/build.sh

@@ -130,8 +130,8 @@ get_version() {
     #  2. if we are in git, override the version with last tag
     #  3. if set, add STAGE (from config.mk) as pre-release ID
     #     (afer dash)
-    #  4. if we are at a later commit than the last tag, add commit
-    #     sha1 to build metadata (after plus sign)
+    #  4. if we are at a later commit than the last tag, add branch
+    #     name and commit sha1 to build metadata (after plus sign)
     #  5. if the tree is "dirty", i.e. has uncommited changes,
     #     add "dirty" to build metadata
     #
@@ -141,8 +141,9 @@ get_version() {
     #
     #     myprog v1.0.7                         # all clear
     #     myprog v1.0.7-alpha                   # STAGE="alpha"
-    #     myprog v1.0.7-alpha+g1aef811          # ^^ + some commits after
-    #     myprog v1.0.7-alpha+g1aef811.dirty    # ^^ + tree edited
+    #     myprog v1.0.7-alpha+g1aef811.master   # ^^ + some commits after
+    #     myprog v1.0.7-alpha+gf14fc4f.api2     # ^^ + on a feature branch
+    #     myprog v1.0.7-alpha+gf14fc4f.api2.dirty  # ^^ + tree edited
     #     myprog v1.0.7-alpha+dirty             # tag OK but tree edited
     #     myprog v1.0.7+dirty                   # ^^ but no stage
     #
@@ -172,6 +173,8 @@ get_version() {
         if ! git describe --tags --exact-match HEAD >&/dev/null;
         then    # we are at a later commit than the last tag
             local sha=g$(git log -1 --pretty=format:%h HEAD)
+            local curbranch=$(git rev-parse --abbrev-ref HEAD)
+            local commit="$curbranch.$sha"
         fi
         if test "$(git diff --shortstat 2>/dev/null)" != "";
         then    # the tree is "dirty", i.e. has been edited
@@ -179,15 +182,15 @@ get_version() {
         fi
         version=${lasttag:1}
         local suffix=""
-        case $stage:$sha:$dirty in
-            ::)         suffix=""                    ;;
-            ::dirty)    suffix="+$dirty"             ;;
-            :g*:)       suffix="+$sha"               ;;
-            :g*:dirty)  suffix="+$sha.dirty"         ;;
-            *::)        suffix="-$stage"             ;;
-            *::dirty)   suffix="-$stage+$dirty"      ;;
-            *:g*:)      suffix="-$stage+$sha"        ;;
-            *:g*:dirty) suffix="-$stage+$sha.$dirty" ;;
+        case $stage:$commit:$dirty in
+            ::)        suffix=""                       ;;
+            ::dirty)   suffix="+$dirty"                ;;
+            :*:)       suffix="+$commit"               ;;
+            :*:dirty)  suffix="+$commit"               ;;
+            *::)       suffix="-$stage"                ;;
+            *::dirty)  suffix="-$stage+$dirty"         ;;
+            *:*:)      suffix="-$stage+$commit"        ;;
+            *:*:dirty) suffix="-$stage+$commit.$dirty" ;;
         esac
         version=$version$suffix
     fi