Fix git describe --tags on topic branches #136
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
| I also considered using Rejected that because in makes it impossible to distinguish between no tags and a tag that is named the same as a short hash (a remote possibility but still a defect that we can do without). |
| Travis failures are due to the bug fixed in #135 . I could rebase the branch to the new |
| Thanks. I merged the other PR so you can rebase. |
…anything." on topic branches
| Linux builds are now okay; MacOS fails are unrelated (ffmpeg build timeout). |
| Yeah, thanks. I'll merge this, but we have to figure out what's going on with the FFmpeg builds. |
|
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.
If there are no tags on a branch,
git describe --tagsinfind_version.pyproduces an error.Was like this in Travis for https://github.com/native-api/opencv-python/tree/readd_ipp_linux , see https://travis-ci.org/native-api/opencv-python/jobs/447134765 for a sample failure.