Sync IRIS with repo changes when switching to a remote branch#788
Merged
isc-pbarton merged 4 commits intointersystems:mainfrom Jun 6, 2025
Merged
Sync IRIS with repo changes when switching to a remote branch#788isc-pbarton merged 4 commits intointersystems:mainfrom
isc-pbarton merged 4 commits intointersystems:mainfrom
Conversation
…more easily applied to other commands Use additional flags to control when and how this behaviour takes effect rather than checking for specific commands. Will allow this to be more easily applied to other commands in the future and also to WebUI commands.
… when switching to a remote branch Switching to a remote branch would previously not sync IRIS with the file repo changes. The diff previously performed prior to the checkout Git command would fail due to the branch not yet existing locally, with nothing being synced.
raymond-rebbeck
force-pushed
the
remote-checkout
branch
from
9775b03 to
50e4e4a
Compare
isc-pbarton
approved these changes
Jun 6, 2025
Collaborator
isc-pbarton
left a comment
isc-pbarton
left a comment
There was a problem hiding this comment.
works great, thank you!
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.
Addresses #783
First commit re-factors the 'diff after git command' mechanism previously added in #517 so that it can be more generically applied to other Git commands.
Second commit applies it to the checkout command.
Works with Git menu dropdown and with WebUI. The diff that was previously being applied prior to the checkout being performed would fail due to the branch not yet being local at that point in time when checking out a remote branch for the first time.