Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix git default branch computation #166

Merged
merged 1 commit into from
May 5, 2021

Conversation

TheLortex
Copy link
Contributor

When given an opam git remote in the form git+https://github.com/..., git ls-remote --symref <remote> HEAD would fail as it doesn't recognize urls in the form git+https, because this is something specific to opam.

This PR applies the same mechanism as in resolve_ref, which is to remove the git+ prefix in that situation.

Copy link
Contributor

@NathanReb NathanReb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks!

@NathanReb NathanReb merged commit b32aadd into tarides:master May 5, 2021
NathanReb added a commit to NathanReb/opam-repository that referenced this pull request Jun 29, 2021
CHANGES:

### Added

- Add `--ocaml-version` argument to `lock`: it allows to determine the ocaml version in the
  lockfile that's being generated (tarides/opam-monorepo#161, @pitag-ha)

### Changed

- Exclude packages depending on `jbuilder` from the lock step. Since dune 2.0, `jbuild` files are
  not supported. A new `--allow-jbuilder` option have been added to enable the old behavior.
- Recognize packages with an optional dependency on dune as building with dune. This allows
  opam-monorepo to rightfully recognize `opam-file-format` latest versions as building with
  dune. (tarides/opam-monorepo#176, @NathanReb)
- Only print the full list of selected root packages once and only in verbose mode, simply printing
  the number in the default logs. (tarides/opam-monorepo#173, @NathanReb)
- Improve the solving process so it only accepts base-compilers unless one explicitly requires
  a compiler variant, either directly or using `ocaml-option-*` packages. (tarides/opam-monorepo#178, @NathanReb)

### Deprecated

### Fixed

- Fix the default branch mechanism when the opam remote starts with `git+https` (tarides/opam-monorepo#166, @TheLortex)
- Fix a log that was still refering to the old tool name `duniverse` (tarides/opam-monorepo#158, @rizo)
- Improve how the default branch for a git repository is queried, fixing a bug
  where opam-monorepo wouldn't work outside of of git repo and a bug where it wouldn't
  work on non-english systems. (tarides/opam-monorepo#157, fixes tarides/opam-monorepo#114, @TheLortex)

### Removed

### Security
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants