Make sure to catch the merge commit when doing git log in the directory

that is to be packaged.

No issue #

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 5f0d13e723bfb96148878f9e1c8ab2563eefcce0..7f8e711c13bcb3d856923d8174933cc46c9ac604 100755 (executable)
--- 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