Resolve symlinks before running git diff #3750
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
rgrinberg
force-pushed
the
symlink-git-diff
branch
3 times, most recently
from
178a0c4 to
c0ceea1
Compare
aalekseyev
reviewed
Aug 28, 2020
rgrinberg
force-pushed
the
symlink-git-diff
branch
2 times, most recently
from
165c5e2 to
25ea2e7
Compare
aalekseyev
requested changes
Aug 31, 2020
|
Any reason you're converting the paths to absolute?
Don't we prefer relative paths where possible? And here it's clearly possible.
The relative paths were quite ugly when displayed by git’s diff as they’re relative to the sandbox dir. I suppose we should just stay consistent, so I switched back to relative paths.
…On Aug 31, 2020, 2:22 AM -0700, ocaml/dune ***@***.***>, wrote:
Any reason you're converting the paths to absolute?
Don't we prefer relative paths where possible? And here it's clearly possible.
|
rgrinberg
force-pushed
the
symlink-git-diff
branch
from
25ea2e7 to
6ab12a5
Compare
aalekseyev
reviewed
Sep 1, 2020
aalekseyev
reviewed
Sep 1, 2020
| @@ -1335,3 +1335,6 @@ let chmod ~mode ?(stats = None) ?(op = `Set) path = | |||
| stats.st_perm land lnot mode | |||
| in | |||
| Unix.chmod (to_string path) mode | |||
|
|
|||
| let follow_symlink path = | |||
| Fpath.follow_symlink (to_string path) |> Result.map ~f:of_string | |||
There was a problem hiding this comment.
I guess of_string can still raise, so not a fan of Path.follow_symlink. I guess this won't be a problem for the diffing though because dune is in control of the symlinks.
aalekseyev
approved these changes
Sep 1, 2020
git diff does not like symlink arguments. Fixes ocaml#3740 Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
rgrinberg
force-pushed
the
symlink-git-diff
branch
from
7ed78a5 to
abdd058
Compare
rgrinberg
added a commit
to rgrinberg/opam-repository
that referenced
this pull request
Sep 3, 2020
…lugin, dune-private-libs and dune-glob (2.7.1) CHANGES: - configurator: More flexible probing of `#define`. We allow duplicate values in the object file, as long as they are the same after parsing. (ocaml/dune#3739, fixes ocaml/dune#3736, @rgrinberg) - Record instrumentation backends in dune-package files. This makes it possible to use instrumentation backends defined in installed libraries (eg via OPAM). (ocaml/dune#3735, @nojb) - Add missing `.aux` & `.glob` targets to coq rules (ocaml/dune#3721, fixes ocaml/dune#3437, @rgrinberg) - Fix `dune-package` installation when META templates are present (ocaml/dune#3743, fixes ocaml/dune#3746, @rgrinberg) - Resolve symlinks before running `$ git diff` (ocaml/dune#3750, fixes ocaml/dune#3740, @rgrinberg) - Cram tests: when checking that all test directories contain a `run.t` file, skip empty directories. These can be left around by git. (ocaml/dune#3753, @emillon)
rgrinberg
added a commit
to rgrinberg/opam-repository
that referenced
this pull request
Sep 5, 2020
…lugin, dune-private-libs and dune-glob (2.7.1) CHANGES: - configurator: More flexible probing of `#define`. We allow duplicate values in the object file, as long as they are the same after parsing. (ocaml/dune#3739, fixes ocaml/dune#3736, @rgrinberg) - Record instrumentation backends in dune-package files. This makes it possible to use instrumentation backends defined in installed libraries (eg via OPAM). (ocaml/dune#3735, @nojb) - Add missing `.aux` & `.glob` targets to coq rules (ocaml/dune#3721, fixes ocaml/dune#3437, @rgrinberg) - Fix `dune-package` installation when META templates are present (ocaml/dune#3743, fixes ocaml/dune#3746, @rgrinberg) - Resolve symlinks before running `$ git diff` (ocaml/dune#3750, fixes ocaml/dune#3740, @rgrinberg) - Cram tests: when checking that all test directories contain a `run.t` file, skip empty directories. These can be left around by git. (ocaml/dune#3753, @emillon)
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.
git diff does not like symlink arguments.
Fixes #3740