diff --git a/.update-changes.cfg b/.update-changes.cfg index b968f4d772..25e4765f27 100644 --- a/.update-changes.cfg +++ b/.update-changes.cfg @@ -8,12 +8,12 @@ function new_version_hook version=$1 if [ -d testing/external/bro-testing ]; then - ( cd testing/external/bro-testing && git rev-parse HEAD ) > testing/external/commit-hash.bro-testing + ( cd testing/external/bro-testing && git fetch origin && git rev-parse origin/master ) > testing/external/commit-hash.bro-testing git add testing/external/commit-hash.bro-testing fi if [ -d testing/external/bro-testing-private ]; then - ( cd testing/external/bro-testing-private && git rev-parse HEAD ) > testing/external/commit-hash.bro-testing-private + ( cd testing/external/bro-testing-private && git fetch origin && git rev-parse origin/master ) > testing/external/commit-hash.bro-testing-private git add testing/external/commit-hash.bro-testing-private fi } diff --git a/CHANGES b/CHANGES index 5714e885f1..8d9a07fd40 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.5-894 | 2018-08-22 12:05:19 -0500 + + * Ensure external test repo hashes track origin/master (Jon Siwek, Corelight) + 2.5-892 | 2018-08-22 11:49:12 -0500 * Fix "unused CMake variable" configuration warnings (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index 2f39fe7562..f035f856e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-892 +2.5-894