use git -c diff.noprefix=false diff #3788
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
Fix ocaml#3627 by ensuring git produces a `-p1` diff. This is a very limited fix but appears to work in my usecase. I have reviewed the other uses of `git diff` in the same file, but it appears their output is not passed to `patch` hence this change is unnecessary.
rjbou
added a commit
to rjbou/opam
that referenced
this pull request
Mar 27, 2019
Fix ocaml#3627 by ensuring git produces a `-p1` diff. This is a very limited fix but appears to work in my usecase. I have reviewed the other uses of `git diff` in the same file, but it appears their output is not passed to `patch` hence this change is unnecessary.
rjbou
added a commit
to rjbou/opam
that referenced
this pull request
Mar 27, 2019
Fix ocaml#3627 by ensuring git produces a `-p1` diff. This is a very limited fix but appears to work in my usecase. I have reviewed the other uses of `git diff` in the same file, but it appears their output is not passed to `patch` hence this change is unnecessary.
rjbou
added a commit
to rjbou/opam
that referenced
this pull request
Mar 28, 2019
Fix ocaml#3627 by ensuring git produces a `-p1` diff. This is a very limited fix but appears to work in my usecase. I have reviewed the other uses of `git diff` in the same file, but it appears their output is not passed to `patch` hence this change is unnecessary.
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.
Rebase on master & close #3628 that fixes #3627.