Fix history traversal of merge commits (fix)

cncsc · May 15, 2023 · 1e1bebb · 1e1bebb
1 parent d698951
commit 1e1bebb
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/scripts/utilities/verify-files-changed.sh b/scripts/utilities/verify-files-changed.sh
@@ -5,17 +5,18 @@ function main() {
   local -r base_directory="$1"
   local -r grep_pattern="$2"
   local -r current_hash="$(git rev-parse HEAD)"
-  local -r previous_hash="$(git rev-list --tags --skip=1 --max-count=1)"
-  local -r previous_version="$(git describe --abbrev=0 --tags "$previous_hash")"
+  local -r previous_hash="$(git rev-list --tags --max-count=1)"
+  local -r previous_parent_hash="$(git rev-list --tags --no-merges --max-count=1)"
+  local -r previous_version="$(git describe --abbrev=0 --tags --exact-match "$previous_hash")"
 
   echo "Most recent tag was $previous_version at commit $previous_hash"
   echo "Complete changeset:"
 
-  git --no-pager diff --name-only "$previous_hash..$current_hash"
+  git --no-pager diff --name-only "$previous_parent_hash..$current_hash"
 
   echo ""
   echo "Looking for files in ./${base_directory}/ matching '${grep_pattern}'"
-  changeset="$(git --no-pager diff --name-only "$previous_hash..$current_hash")"
+  changeset="$(git --no-pager diff --name-only "$previous_parent_hash..$current_hash")"
   changeset="$(echo "$changeset" | grep -E "^$base_directory/.*")"
   changeset="$(echo "$changeset" | grep -E "$grep_pattern" || true)"