Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use git -c diff.noprefix=false diff #3788

Merged
merged 1 commit into from Mar 20, 2019

Conversation

Projects
None yet
2 participants
@rjbou
Copy link
Collaborator

commented Mar 20, 2019

Rebase on master & close #3628 that fixes #3627.

Fix #3627: use git -c diff.noprefix=false diff
Fix #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.
@Blaisorblade
Copy link

left a comment

LGTM!

@rjbou rjbou merged commit 7f4d719 into ocaml:master Mar 20, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@rjbou rjbou added this to the 2.1.0 milestone Mar 20, 2019

rjbou added a commit to rjbou/opam that referenced this pull request Mar 27, 2019

Fix ocaml#3627: use git -c diff.noprefix=false diff (ocaml#3788)
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: use git -c diff.noprefix=false diff (ocaml#3788)
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 rjbou referenced this pull request Mar 27, 2019

Merged

2.0.4 backported commits #3805

@rjbou rjbou modified the milestones: 2.1.0, 2.0.4 Mar 28, 2019

rjbou added a commit to rjbou/opam that referenced this pull request Mar 28, 2019

Fix ocaml#3627: use git -c diff.noprefix=false diff (ocaml#3788)
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
You can’t perform that action at this time.