Merge remote-tracking branch 'origin/topic/timw/ignore-more-stuff-in-…

…git-move-submodules'

* origin/topic/timw/ignore-more-stuff-in-git-move-submodules:
  Ignore some extra third-party submodules in git-move-submodules

CHANGES

@@ -1,3 +1,7 @@
+0.50-137 | 2024-07-09 09:32:09 -0700
+
+  * Ignore some extra third-party submodules in git-move-submodules (Tim Wojtulewicz, Corelight)
+
 0.50-134 | 2024-07-04 16:12:58 +0200
 
   * CI: drop macos versions unsupported by Cirrus (Benjamin Bannier, Corelight)

README

@@ -1,7 +1,7 @@
 .. -*- mode: rst; -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.50-134
+.. |version| replace:: 0.50-137
 
 =======================
 Zeek Auxiliary Programs

VERSION

@@ -1 +1 @@
-0.50-134
+0.50-137

devel-tools/git-move-submodules

@@ -22,7 +22,7 @@ function update_module {
     # Note we don't use --recursive here, as we want to do a depth-first
     # search so that we update childrens first. Update this list of submodules
     # to include/exclude what should be updated.
-    for i in $(git submodule foreach -q 'echo $path' | grep -v '3rdparty\|highwayhash\|libkqueue\|rapidjson\|caf'); do
+    for i in $(git submodule foreach -q 'echo $path' | grep -v '3rdparty\|highwayhash\|libkqueue\|rapidjson\|caf\|prometheus-cpp\|filesystem\|vcpkg'); do
         # See if repository has a branch of the given name. Otherwise leave it alone.
         (cd $i && git show-ref --verify --quiet refs/heads/$branch) || continue
 

zeek-archiver/zeek-archiver.cc

@@ -24,7 +24,7 @@
 #include <vector>
 #include <set>
 
-constexpr auto ZEEK_ARCHIVER_VERSION = "v0.50-134";
+constexpr auto ZEEK_ARCHIVER_VERSION = "v0.50-137";
 
 struct Options {
 	std::string src_dir;