Skip to content

Commit aa8c6e5

Browse files
committed
fixed issues with Socket.Run()
1 parent 356accd commit aa8c6e5

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

cls/_zpkg/isc/sc/git/Socket.cls

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ ClassMethod Run()
1313
{
1414
If %request.Get("method") = "preview" {
1515
set branchName = ##class(SourceControl.Git.Utils).GetCurrentBranch()
16-
do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "pull", "origin/" _ branchName)
16+
do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "fetch")
17+
kill errStream, outStream
18+
do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "diff", "origin/"_branchName)
1719
} ElseIf %request.Get("method") = "pull" {
1820
Do ##class(SourceControl.Git.API).Pull()
1921
} ElseIf %request.Get("method") = "init" {

0 commit comments

Comments
 (0)