sfdx-git-delta picking up previous delta changes

[j-obrien97]

Experiencing an issue where the delta package is created successfully, however, when going to make another change in the repository, on the pr build (and completion) pipeline included the previous delta changes.

Pipeline is an Azure DevOps Pipeline running on a YAML file.

Main guts of the YAML below:

• script: |
  sfdx update
  displayName: Install SF CLI
• script: echo y | sfdx plugins:install sfdx-git-delta
  displayName: Install SFDX Git Delta
• script: |
  git config remote.origin.fetch '+refs/heads/:refs/remotes/origin/'
  git fetch --all
  sfdx sgd:source:delta -f origin/master --output .
  displayName: Creating Delta
• script: sfdx force:source:convert --manifest package/package.xml --output-dir=convert
  displayName: Convert to MDAPI

I would expect that after the PR completes, 'origin/master' would include the previous changes. Am i incorrect?

[scolladon]

Hi @j-obrien97 !

Thanks for those information.

I have questions:

• Does the changes are in the same PR ?
• Does the next PR is from another branch ?
• Could you explain with a bit more detail how it works ? I would like to reproduce it myself so I can be sure to completely understand the situation ?

[scolladon]

I don't think the omission of the -t parameter change anything here as it is replaced by "HEAD" anyway.
What is the result of sfdx sgd:source:delta -f origin/master --output . locally ?

Do you have a way to share this repository ? Or a similar one just so I can reproduce it myself ?

[j-obrien97]

Locally its working as expected.
(Local process)
Git Pull on Master branch
Created new branch
updated a profile permission save & commit
Run SGD
Create package with singular profile update and doesn't include 3 other profile updates + 1 class update

Unfortunately, i don't have the access to share the repo or a similar one. Its pretty bare bones though, only contains some Lightning Web Component (singular JSON), profiles, and a handful of classes. Its possible that AzureDevOps is doing some manipulating behind the scenes though. I tried adding -t "HEAD" -f "HEAD1" as well and the HEAD1 is resolving correctly

[scolladon]

If you can have a repo to isolate and reproduce it would be perfect.
It is not clear to me what is happening in the context of this pipeline and I need a closer look.

[j-obrien97]

Hey @scolladon
Ive actually have been able to resolve my issues.
So for the "HEAD~1" format not working correctly, I needed to set my fetchDepth to 0 in the steps piece of the yaml, that corrected my post merge pipeline. I wasnt aware but in 2019(?) Azure made it so that new pipelines fetchDepth was automatically set to shallow, so this piece is a necessity :
steps:

• checkout: self
  persistCredentials: true
  fetchDepth: 0

For the bringing back multiple changes into the delta. I found that using $(git rev-parse origin/master) is the way to go. I had been messing around with the commits but when i would try to add remotes/origin or just origin/ it was failing. But the command by itself seems to be working as expected

[scolladon]

Hi @j-obrien97 thanks for sharing this.

You are not the first one to have this issue with Azure...
We have a dedicated section about CI/CD, but it is not specific... Maybe we could have a different file just to cover the specificities of every CI/CD used with Salesforce...