Ignore trailing newlines when doing 'test and set' on reference files #611
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
|
The proper fix should probably be to modify https://github.com/mirage/ocaml-git/blob/master/src/git/fs.ml#L630-L638, but this patch should be fine too. |
|
I think you might need
(the I think these should fix CircleCI and appveyor |
|
@djs55 thanks, I have rebased on top on your branch |
talex5
reviewed
Sep 29, 2017
Dockerfile.ci
Outdated
| @@ -1,8 +1,7 @@ | |||
| FROM ocaml/opam-dev@sha256:1dd4440b3e5f182f705cb5a74f9d4e860c2842b45ed72c199de89a894d13f522 | |||
| #FROM ocaml/opam-dev:alpine-3.5_ocaml-4.04.0 | |||
| FROM ocaml/opam:alpine-3.5_ocaml-4.04.0 | |||
There was a problem hiding this comment.
Why the move back to opam 1?
This is because `git commit` might add these. Fix moby#610 Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
|
Rebased on top of master. |
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.
This is because
git commitmight add these. Fix #610/cc @djs55