SGD Delta is showing us all file diff

[duttayan98]

Issue verification check:

• is the current repository fully deployable at the commit SHA provided with the 'from' parameter of the command?

What is the problem?

--- When we are running SGD Delta using this command
sf sgd:source:delta -a 56 --to HEAD --from origin/$BASE_BRANCH --output changed-sources/ -i manifest/mdapi/.sgdignore --generate-delta

Here BASE_BRANCH is our ORG branch (Ex: QA, DEV, UAT)

Diff files are getting generated larger than expected, actually it's whole file difference.

What is the parameter and the value you used with it?

sf sgd:source:delta -a 56 --to HEAD --from origin/$BASE_BRANCH --output changed-sources/ -i manifest/mdapi/.sgdignore --generate-delta

What is the expected result?

Diff should only contain last commit of base branch to the last commit of the source branch.

What is the actual result?

Diff files are getting generated larger than expected, actually it's whole file difference.

Steps to reproduce

1. Generate PR in bitbucket which is showing the correct diff.
2. After pipeline gets triggered in azure dev ops generate delta is a step where we run the above command.
3. After generating delta it's showing multiple diff in files.

Execution context

---

Operating System: …

npm version: … 9.6.7

node version: … 18.17.1

git version: …2.39.5

sf version: …2.62.6

sgd plugin version: … 6.1.1

More information (optional)

---

[scolladon]

Hi @!

Thanks for raising this issue and thanks for contributing in making this project better!

Could you help me reproduce the issue locally ?
You can either describe what commit content I should create inside a repository, or you could also fork the reproduction playground, create a branch, write the necessary commit to reproduce and share that branch here.
And give me the commands to run with sgd to reproduce the issue.

[duttayan98]

In order to reproduce the issue i need your approval on the pull request : scolladon/sfdx-git-delta-reproduction-playground#9
after that i will raise another Pull Request where i will able to reproduce the issue.

[scolladon]

Hi @duttayan98

You can do that in your own fork!

[duttayan98]

Hi @scolladon
I have replicated the issue, consider the issue as follows:
I have main branch which consist of two files Test and Test2
--> I created two different branches from main named feature-1 and feature-2
--> I have changed file Test in feature-1 and merged in main
--> Now I checkout to feature-2 and change file Test2
--> now using command sf sgd:source:delta --to HEAD --from origin/main --output . --generate-delta (HEAD at feature-2) i generated the delta package giving file changed in both Test and Test2
--> But using git diff feature-2...origin/main --name-only i am getting the expected output that is only change in Test (not in Test2)
Here is the fork repo link: https://github.com/duttayan98/sfdx-git-delta-reproduction-playground

[scolladon]

Ok, I think I see what you mean.

This is not an issue, this how the git diff we are using internally works.

In order to have only the changes with your commit only, and not the ones already merged in the target branch, you need to compare from a common ancestor.
This is what .. does with git diff but this is not what we use.
This is why you need to merge-base instead.

You could also rebase your branch on top of main. In this case you don't need merge-base

Closing this issue as Work As Designed (WAD)
Feel free to reopen it if I got you wrong or if you have more information.

Happy incremental deployment!

[duttayan98]

Thanks @scolladon that fixed the issue .