When performing a pull set diffBase so that the diff to sync files with IRIS is performed in the intended direction#803
Merged
isc-pbarton merged 2 commits intointersystems:mainfrom Jul 8, 2025
Conversation
…th IRIS is performed in the intended direction Setting diffCompare previously had the unintended result of a '..' prefix being added to the git diff command which would result in the diff being performed in the reverse direction than intended, causing additions to be treated as deletions for example.
raymond-rebbeck
force-pushed
the
fix-pull-diff-direction
branch
from
840c6bb to
e047de3
Compare
isc-pbarton
approved these changes
Jul 8, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #802
Setting
diffComparepreviously had the unintended result of a..prefix being added to the git diff command which would result in the diff being performed in the reverse direction than intended, causing additions to be treated as deletions for example.