[ARVADOS-DEV] updated: 510a6b6a1a8e263a7cfb305032ae3ef07d88a400

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-build-packages.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

       via  510a6b6a1a8e263a7cfb305032ae3ef07d88a400 (commit)
      from  6086e2a55293b8a21883f720788d951c3545cac6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 510a6b6a1a8e263a7cfb305032ae3ef07d88a400
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed Jul 8 09:59:54 2015 -0400

    Fix up git log statements:
    
    * remove duplication between -n1 and --max-count=1
    * make sure every git log statement has --first-parent
    
    refs #6096

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 0eb2244..bb65130 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -204,7 +204,7 @@ version_from_git() {
   # Generates a version number from the git log for the current working
   # directory, and writes it to stdout.
   local git_ts git_hash
-  declare $(TZ=UTC git log -n1 --first-parent --max-count=1 \
+  declare $(TZ=UTC git log -n1 --first-parent \
       --format=format:"git_ts=%ct git_hash=%h" .)
   echo "0.1.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).$git_hash"
 }
@@ -213,7 +213,7 @@ timestamp_from_git() {
   # Generates a version number from the git log for the current working
   # directory, and writes it to stdout.
   local git_ts git_hash
-  declare $(TZ=UTC git log -n1 --first-parent --max-count=1 \
+  declare $(TZ=UTC git log -n1 --first-parent \
       --format=format:"git_ts=%ct git_hash=%h" .)
   echo "$git_ts"
 }
@@ -506,15 +506,15 @@ if [[ "$DEBUG" != 0 ]]; then
   git checkout master
   git pull
   # go into detached-head state
-  git checkout `git log --format=format:%h -n1 .`
+  git checkout `git log --format=format:%h -n1 --first-parent .`
 else
   git checkout -q master
   git pull -q
   # go into detached-head state
-  git checkout -q `git log --format=format:%h -n1 .`
+  git checkout -q `git log --format=format:%h -n1 --first-parent .`
 fi
 
-git log --format=format:%H -n1 . > git-commit.version
+git log --format=format:%H -n1 --first-parent . > git-commit.version
 
 # Build arvados src deb package
 cd "$WORKSPACE"

-----------------------------------------------------------------------


hooks/post-receive
--