From b98ee12eeb04ceb6bc6bb0565a8bc017c2362661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sat, 30 Jul 2022 17:52:58 +0200
Subject: [PATCH] RepositoryGit: bugfix, include .yaml files

---
 src/RepositoryGit.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/RepositoryGit.php b/src/RepositoryGit.php
index eafdfb2d..6a95c89e 100644
--- a/src/RepositoryGit.php
+++ b/src/RepositoryGit.php
@@ -80,7 +80,10 @@ class RepositoryGit extends RepositoryBase {
         $data['categories'][$id] = jsonMultilineStringsJoin($d1, array('exclude' => array(array('const'), array('filter'))));
       }
 
-      if (preg_match("/^([0-9a-zA-Z_\-]+)\.yaml$/", $r, $m)) {
+      if (preg_match("/^[0-9]{6} blob [0-9a-f]{40}\t(([0-9a-zA-Z_\-]+)\.yaml)$/", $r, $m)) {
+        $f = $m[1];
+        $id = $m[2];
+
         $d1 = yaml_parse(shell_exec("cd " . escapeShellArg($this->path) . "; git show {$this->branchEsc}:" . escapeShellArg($f)));
         $d1['format'] = 'yaml';
 
@@ -88,7 +91,7 @@ class RepositoryGit extends RepositoryBase {
 	  continue;
 	}
 
-        $data['categories'][$m[1]] = $d1;
+        $data['categories'][$id] = $d1;
       }
 
       if (preg_match("/^[0-9]{6} blob [0-9a-f]{40}\t((detailsBody|popupBody)\.html)$/", $r, $m)) {
@@ -129,7 +132,7 @@ class RepositoryGit extends RepositoryBase {
     $ret = array_filter(
       $ret,
       function ($file) {
-	return preg_match("/\.(html|json)$/", $file);
+	return preg_match("/\.(html|json|yaml)$/", $file);
       }
     );