Skip to content

Error when pulling change from remote that adds two or more non-IRIS code files #273

Closed
@isc-pbarton

Description

@isc-pbarton

Steps to replicate:

  1. Set up two local git repos cloning the same remote
  2. Set up an IRIS instance using git-source-control configured with one of the repos
  3. On the other repo, add two files that are not IRIS code. Commit and push to the remote.
  4. With VS Code server-side editing the IRIS instance, open the Server Side Source Control menu and click the "Pull changes from remote branch" option.

I get a frightening message in the output window:

Pulling from branch: main
Fetch done
Files that will be modified by git pull: 
    A        test5.txt
    A        test6.txt
Updating e40f870..d5a9148
Fast-forward
 test5.txt | 0
 test6.txt | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test5.txt
 create mode 100644 test6.txt

ERROR #5002: ObjectScript error: <SUBSCRIPT>AddToServerSideSourceControl+4^SourceControl.Git.Utils.1 ^SYS("SourceControl","Git","items","")

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

      Development

      Participants

      @isc-pbarton

      Issue actions

        Error when pulling change from remote that adds two or more non-IRIS code files · Issue #273 · intersystems/git-source-control