From 47862bbf22fc942bd58318c108d2605c687e9690 Mon Sep 17 00:00:00 2001 From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:58:05 -0400 Subject: [PATCH 1/2] pull preview now specifies remote branch to diff --- cls/_zpkg/isc/sc/git/Socket.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cls/_zpkg/isc/sc/git/Socket.cls b/cls/_zpkg/isc/sc/git/Socket.cls index 48c5e4ed..0c1dbfaf 100644 --- a/cls/_zpkg/isc/sc/git/Socket.cls +++ b/cls/_zpkg/isc/sc/git/Socket.cls @@ -16,7 +16,7 @@ ClassMethod Run() Write !,"Current branch: ",branchName Do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "fetch") Kill errStream, outStream - Do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "log", "HEAD..origin", "--name-status") + Do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "log", "HEAD..origin/"_branchName, "--name-status") Do ##class(SourceControl.Git.Utils).PrintStreams(errStream, outStream) If (outStream.Size = 0) && (errStream.Size = 0) { Write !,"Already up to date." From 5ef31c805dc403d16e1aafc5177ae99e76f90cb2 Mon Sep 17 00:00:00 2001 From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:01:04 -0400 Subject: [PATCH 2/2] update changelog for pull preview fix --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30644816..f712418e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed pull event handler handling of extremely long class names from diff (#467) - Fixed Git web UI prompt to update file list when file selected/unselected (#478) - Fixed folder settings in mappings to be saved and persist (#483) +- Preview on the pull.csp page now shows commits from the correct branch (#490) ## [2.4.1] - 2024-08-02