Write commit hashes into the lock dir when locking git repositories #13297

Leonidas-from-XIV · 2026-01-12T15:05:17Z

This PR applies #13176 and adds the remaining code to implement the behavior discussed in #13110. The tests change accordingly with the changed semantics of git URLs.

Closes #13110

src/dune_pkg/lock_pkg.ml

test/blackbox-tests/test-cases/pkg/pin-stanza/source-locking.t

Alizter

Can you add test cases for branches and tags?

Leonidas-from-XIV · 2026-01-16T15:26:36Z

Currently blocked by #13333 to figure out what to do with the failing tests.

Leonidas-from-XIV · 2026-01-20T14:58:55Z

I've added tests for tags & branches and a solution for the issue that's described in #13333. This should solve the problem with failing tests.

@Alizter

…13396) In `rev_store.ml` we currently try to create the rev-store folder and if it exists then we assume that it is a bare repo. This is not necessarily the case and if the folder is e.g. empty (because a previous `init --bare` failed) the rev-store is permanently bricked with no way to recover (bar the user removing it but it is unclear from the error what the user can do, as `git` points at somewhere else). Noticed this behavior when pairing on a strange test failure on #13297 with @Alizter and paired with @Sudha247 to create a repro case. This PR is a variant of #13392 which reproduces the same behavior using a different approach which does not require the changes from #13297. Signed-off-by: Marek Kubica <marek@tarides.com>

Change request adressed

Signed-off-by: Marek Kubica <marek@tarides.com>

src/dune_pkg/opam_solver.ml

Signed-off-by: Marek Kubica <marek@tarides.com>

src/dune_pkg/opam_solver.ml

Signed-off-by: Marek Kubica <marek@tarides.com>

rgrinberg · 2026-01-23T16:22:47Z

test/blackbox-tests/test-cases/pkg/fakegit.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# dummy implementation of just enough git to be able to create a lock file


A bit surprised that you need this. Isn't it possible to use a remote that is on the local file system? Or does that not test everything?

The opam-source-conversions.t test tries multiple types of remotes:

git+file which can be tested by redirecting it to an existing local repo (see the second commit in this PR)

git+http which would need to be redirected to a local HTTP server. Possible but given how many issues the one-shot HTTP server had, I'd rather not launch and interact with an HTTP server in Cram tests.

git+foobar can't really be tested locally.

I've created #13333 to discuss this issue and it seemed to me that fitting in a fake git in the git+http and git+foobar cases would be the best course of action.

Okay, so the tests are using the real git binary for git+file then?

Yes, it is only used in the git+http and git+foobar cases where our fake git binary in _bin/git is injected via

$ PATH=_bin:$PATH solve testpkg

The git+file case uses the real git binary provided by the system. I've specifically tested that it resolves correctly because I remember that there is some weirdness when setting environment variables in front of function calls on sh. But given we run with bash this issue is not happening.

src/dune_pkg/resolved_package.ml

Signed-off-by: Marek Kubica <marek@tarides.com>

rgrinberg · 2026-01-23T16:34:23Z

src/dune_pkg/opam_solver.ml

-               resolve_package name (OpamPackage.version opam_package)
-             in
+           let+ resolved_pkgs =
+             resolve_opam_packages opam_packages_to_lock ~resolve_package


How about passing the table instead of the function? I prefer first order code when possible.

I agree, however the resolve_package function is used further down, where in computes ocaml, so I can't completely eliminate it without major rewriting.

Signed-off-by: Marek Kubica <marek@tarides.com>

Leonidas-from-XIV requested a review from Alizter January 12, 2026 15:05

Leonidas-from-XIV added the package management label Jan 12, 2026

Leonidas-from-XIV force-pushed the lock-git-revision-take-2 branch 2 times, most recently from d669f81 to 64a79d3 Compare January 12, 2026 22:01

Alizter reviewed Jan 14, 2026

View reviewed changes

src/dune_pkg/lock_pkg.ml Outdated Show resolved Hide resolved

Alizter reviewed Jan 14, 2026

View reviewed changes

test/blackbox-tests/test-cases/pkg/pin-stanza/source-locking.t Show resolved Hide resolved

Alizter previously requested changes Jan 14, 2026

View reviewed changes

Leonidas-from-XIV force-pushed the lock-git-revision-take-2 branch from 64a79d3 to c3fbe74 Compare January 14, 2026 14:32

Leonidas-from-XIV marked this pull request as draft January 14, 2026 15:24

Leonidas-from-XIV force-pushed the lock-git-revision-take-2 branch 4 times, most recently from b0992b8 to b8da39b Compare January 16, 2026 09:29

Leonidas-from-XIV mentioned this pull request Jan 16, 2026

opam-source-conversion.t test cases test invalid URLs #13333

Closed

This was referenced Jan 20, 2026

Test that shows that rev-store is not validated correctly #13392

Closed

Test that shows that rev-store is not checked for validity properly #13396

Merged

Leonidas-from-XIV force-pushed the lock-git-revision-take-2 branch from 67ff831 to 22f9289 Compare January 20, 2026 14:56

Leonidas-from-XIV marked this pull request as ready for review January 20, 2026 14:57

Leonidas-from-XIV requested a review from Alizter January 20, 2026 14:57

Leonidas-from-XIV added 4 commits January 23, 2026 13:12

Resolve git URLs to their revisions when locking

e88c32a

Signed-off-by: Marek Kubica <marek@tarides.com>

Fix one of the conversion tests with a local repo

c11c876

Signed-off-by: Marek Kubica <marek@tarides.com>

Use fake git to pass tests using git

0be3f8b

Signed-off-by: Marek Kubica <marek@tarides.com>

Fake implementation of rev-parse --is-bare-repository

0eaf154

Signed-off-by: Marek Kubica <marek@tarides.com>

Leonidas-from-XIV force-pushed the lock-git-revision-take-2 branch from 22f9289 to 0eaf154 Compare January 23, 2026 12:21

Leonidas-from-XIV requested review from Sudha247 and punchagan January 23, 2026 12:22

Leonidas-from-XIV requested a review from ElectreAAS January 23, 2026 12:22

Alizter reviewed Jan 23, 2026

View reviewed changes

src/dune_pkg/opam_solver.ml Outdated Show resolved Hide resolved

Warn if display=Short and we resolved a branch to a commit

0ad8afd

Signed-off-by: Marek Kubica <marek@tarides.com>

Leonidas-from-XIV requested review from Alizter and rgrinberg January 23, 2026 16:11

rgrinberg reviewed Jan 23, 2026

View reviewed changes

src/dune_pkg/opam_solver.ml Outdated Show resolved Hide resolved

Use Fiber.parallel_map

b0acf2d

Signed-off-by: Marek Kubica <marek@tarides.com>

rgrinberg reviewed Jan 23, 2026

View reviewed changes

src/dune_pkg/resolved_package.ml Outdated Show resolved Hide resolved

Error out on unsupported case

ac84807

Signed-off-by: Marek Kubica <marek@tarides.com>

rgrinberg reviewed Jan 23, 2026

View reviewed changes

Pass candidate cache instead of resolving function

2421d90

Signed-off-by: Marek Kubica <marek@tarides.com>

rgrinberg approved these changes Jan 23, 2026

View reviewed changes

Leonidas-from-XIV merged commit 265ecbf into ocaml:main Jan 23, 2026
28 checks passed

Leonidas-from-XIV deleted the lock-git-revision-take-2 branch January 23, 2026 17:08

Leonidas-from-XIV mentioned this pull request Jan 23, 2026

Use git_repo to pin git packages #13176

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Write commit hashes into the lock dir when locking git repositories #13297

Write commit hashes into the lock dir when locking git repositories #13297

Leonidas-from-XIV commented Jan 12, 2026

Uh oh!

Uh oh!

Uh oh!

Alizter left a comment

Uh oh!

Leonidas-from-XIV commented Jan 16, 2026

Uh oh!

Leonidas-from-XIV commented Jan 20, 2026

Uh oh!

Uh oh!

Uh oh!

rgrinberg Jan 23, 2026

Uh oh!

Leonidas-from-XIV Jan 23, 2026

Uh oh!

rgrinberg Jan 23, 2026

Uh oh!

Leonidas-from-XIV Jan 23, 2026 •

edited

Loading

Uh oh!

Uh oh!

rgrinberg Jan 23, 2026

Uh oh!

Leonidas-from-XIV Jan 23, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -0,0 +1,55 @@
		#!/bin/bash

		# dummy implementation of just enough git to be able to create a lock file

Write commit hashes into the lock dir when locking git repositories #13297

Write commit hashes into the lock dir when locking git repositories #13297

Conversation

Leonidas-from-XIV commented Jan 12, 2026

Uh oh!

Uh oh!

Uh oh!

Alizter left a comment

Choose a reason for hiding this comment

Uh oh!

Leonidas-from-XIV commented Jan 16, 2026

Uh oh!

Leonidas-from-XIV commented Jan 20, 2026

Uh oh!

Uh oh!

Uh oh!

rgrinberg Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

Leonidas-from-XIV Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

rgrinberg Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

Leonidas-from-XIV Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rgrinberg Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

Leonidas-from-XIV Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Leonidas-from-XIV Jan 23, 2026 •

edited

Loading