Fix test-and-set for packed references #291
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
See moby/datakit#610 for details
|
/cc @talex5 |
talex5
reviewed
Apr 13, 2018
src/git/fs.ml
Outdated
| @@ -635,7 +642,13 @@ module Make (IO: IO) (D: Hash.DIGEST) (I: Inflate.S) = struct | |||
| | Some v -> Some (Cstruct.of_string (Hash.to_hex v)) | |||
| in | |||
| let lock = lock_file t r in | |||
| IO.test_and_set_file file ~temp_dir ~lock ~test:(raw test) ~set:(raw set) | |||
| let is_read_packed_ref = Reference.Set.mem r t.read_packed_refs in | |||
| let test = if is_read_packed_ref then None else raw test in | |||
There was a problem hiding this comment.
Does this mean that when updating a packed ref, you can specify any value for test and it will update? I guess if this code is going away soon it probably doesn't matter, but might be worth a warning comment in the API.
There was a problem hiding this comment.
This should be fixed now.
As ocaml-git 1.11 never unpack the packed references (instead it just writes loose references when it wants to update them), test_and_set_reference needs to be adapted. Note: remove_reference and test_and_set ~set:None are completely buggy when using packed references. This will be fixed by ocaml-git 2.0 but there is no easy fix in ocaml-git 1.11... So simply add a note in API docs.
samoht
added a commit
to samoht/opam-repository
that referenced
this pull request
Apr 13, 2018
Changes: - git: make `Git.FS.test_and_set_references` work better with packed references (mirage/ocaml-git#291, @samoht. Fixes moby/datakit#633) - git-unix: ignore trailing newlines when doing 'test and set' on reference files (backport of moby/datakit#611, @samoht. Fixes moby/datakit#610) - git-mirage: fix linking of tests (@samoht)
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.
As ocaml-git 1.11 never unpack the packed references (instead it just writes
loose references when it wants to update them), test_and_set_reference needs
to be adapted.
Note: remove_reference and test_and_set ~set:None are completely buggy when
using packed references. This will be fixed by ocaml-git 2.0 but there is
no easy fix in ocaml-git 1.11... So simply add a note in API docs.