Set upstream on all local branches #219
Merged
Conversation
This file contains 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
Comment on lines
+50
to
+54
| subprocess.check_call( | ||
| f"cd /d {EPICS_PATH} && FOR /F \"delims=* \" %i IN ('git branch') " | ||
| "DO git branch --set-upstream-to=origin/%i %i", | ||
| shell=True, | ||
| ) |
There was a problem hiding this comment.
Isn't this just git config push.autoSetupRemote true or am I missing something?
And if we can't use the git config flag for some reason, is there a reason this loop needs to be in bat rather than using gitpython to loop in python?
There was a problem hiding this comment.
i think autSetupRemote means you can push without using -u whereas we want to pull here and need to setup where to pull from. Upsteam is more recent, will it let you do a push first (even though there is nothing to push and upsteam is ahead) which would just setup the remote and then allow a pull?
the only reason i didn't use gitpython here was the rest of the file didn't use it and i was minimising how much i changed
Tom-Willemsen
approved these changes
Jan 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This sets the upstream for all branches after an install and pulls before making local instrument branch, this ensures any hotfixes post build of release are immediately installed