gitutil: find default remote by tracking branch #2146
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
Using this command resolves remote based on remote tracking branch of the curently selected branch and should be more precise in case we can't predict if user uses origin to mark upstream or their fork. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
gitutil-default-remote
branch
from
4dbc66a
to
6028094
Compare
|
The test failed for the condition of a single remote without any remote-tracking so I switched the implementation to still check for remote-tracking branch but avoid using |
jedevc
approved these changes
Dec 1, 2023
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.
Using this command resolves remote based on remote-tracking branch of the currently selected branch and should be more precise in case we can't predict if the user uses origin to mark upstream or their fork.
This reverses #1548 . The issue there isn't unfortunately very clear about what exact case did not show correct output before. It is possible it was just a misunderstanding about how
ls-remote --get-urlworks.https://github.com/git/git/blob/v2.43.0/remote.c#L550-L554
The "origin" fallback probably does not do anything anymore. 95% sure it is safe to remove.Looking at the git source, another difference is that if there is only one remote, thenls-remote --get-urlreturns that(even if not remote-tracking) while the current implementation would not set URL in this case. If this is not the behavior we want, it could be detected with some additional commands or we could get the remote-tracking branch directly withoutls-remote.