Added support for non-empty git-svn prefix #23
Merged
Conversation
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
…fault --prefix is "origin/" in Git 2.0+.
jwiegley added a commit that referenced this pull request Jan 18, 2016
Added support for non-empty git-svn prefix
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.
Prior to Git 2.0, git-svn init/clone operations used an empty --prefix by-default. In 2.0, the default prefix is changed to "origin/". This is for good reason - it avoids the non-standard, non-prefixed branch-names previously-created by git-svn when importing remote branches.
The git-svn-diff script, when working on non-trunk (i.e. a branch under /branches) made the assumption that remote branch-names were non-prefixed, e.g. "my-branch" instead of "origin/my-branch" when looking for the current commit.
This commit adds support for discovering and using the git-svn prefix. It should work with both Git <2.0 and >=2.0, and with empty and non-empty prefixes.