From 23fa740736501e4cf023a3a94a3f9e567e95c2fa Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Wed, 15 Oct 2014 10:55:32 -0400 Subject: [PATCH] Make sure to catch the merge commit when doing git log in the directory that is to be packaged. No issue # --- jenkins/run-build-packages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh index 5f0d13e..7f8e711 100755 --- a/jenkins/run-build-packages.sh +++ b/jenkins/run-build-packages.sh @@ -235,9 +235,9 @@ fi cd "$WORKSPACE" -GIT_TIMESTAMP=`git log --format=format:%ct -n1 .` +GIT_TIMESTAMP=`git log --first-parent --max-count=1 --format=format:%ct -n1 .` HUMAN_READABLE_TIMESTAMP=`TZ=UTC date -d @$GIT_TIMESTAMP +%Y%m%d%H%M%S` -GIT_HASH=`git log --format=format:$HUMAN_READABLE_TIMESTAMP.%h -n1 .` +GIT_HASH=`git log --first-parent --max-count=1 --format=format:$HUMAN_READABLE_TIMESTAMP.%h -n1 .` cd sdk/python handle_python_package -- 2.30.2