From 33919805aa4b9c4796ff07ad5b9d338b2a1561f3 Mon Sep 17 00:00:00 2001 From: Antoine-dh <34452142+Antoine-dh@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:07:48 +0100 Subject: [PATCH 1/2] Change .git file DirectoryExists check to Exists --- cls/SourceControl/Git/PackageManagerContext.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cls/SourceControl/Git/PackageManagerContext.cls b/cls/SourceControl/Git/PackageManagerContext.cls index 7431deab..ab6c42fd 100644 --- a/cls/SourceControl/Git/PackageManagerContext.cls +++ b/cls/SourceControl/Git/PackageManagerContext.cls @@ -24,7 +24,7 @@ Method InternalNameSet(InternalName As %String = "") As %Status } set ..Package = ##class(%ZPM.PackageManager.Developer.Extension.Utils).FindHomeModule(InternalName,,.resourceReference) set ..ResourceReference = resourceReference - set ..IsInGitEnabledPackage = $isobject(..Package) && ##class(%Library.File).DirectoryExists(##class(%Library.File).NormalizeFilename(".git",..Package.Root)) + set ..IsInGitEnabledPackage = $isobject(..Package) && ##class(%Library.File).Exists(##class(%Library.File).NormalizeFilename(".git",..Package.Root)) set ..IsInDefaultPackage = $isobject(..Package) && (##class(%Library.File).NormalizeDirectory(..Package.Root) = ##class(%Library.File).NormalizeDirectory(##class(SourceControl.Git.Utils).DefaultTempFolder())) } quit $$$OK From 5efba72b84ffae87577e749a688e1bdf02ad7c7d Mon Sep 17 00:00:00 2001 From: isc-tleavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:55:36 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md and module.xml --- CHANGELOG.md | 5 +++++ module.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83714154..a99708d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.3.1] - Unreleased + +### Fixed +- Support for git submodules in package manager-aware setting (#305) + ## [2.3.0] - 2023-12-06 ### Added diff --git a/module.xml b/module.xml index a05a04d8..b5dc3195 100644 --- a/module.xml +++ b/module.xml @@ -3,7 +3,7 @@ git-source-control - 2.3.0 + 2.3.1 Server-side source control extension for use of Git on InterSystems platforms git source control studio vscode module