This request is superseded by
request 1058228
(Show diff)
You're not reviewing the full diff of
request 1058204
, but the diff to the superseded
request 1058017
(Show full diff)
Overview
Request 1058204 superseded
- Make the priority for picking the storage driver configurable (bsc#1197093)
(backport of https://github.com/containers/storage/pull/1460)
- add patch: 0002-Make-the-priority-for-picking-the-storage-driver-con.patch
- Created by danishprakash
- In state superseded
-
Package maintainers:
dancermak and
danishprakash
- Supersedes 1058017
- Superseded by 1058228
Loading...
Request History
danishprakash created request
- Make the priority for picking the storage driver configurable (bsc#1197093)
(backport of https://github.com/containers/storage/pull/1460)
- add patch: 0002-Make-the-priority-for-picking-the-storage-driver-con.patch
danishprakash superseded request
superseded by 1058228
That looks like you added your own header instead of using the commits.
It has to look like https://github.com/containers/storage/pull/1460/commits/881ac4864a79b830f271e6d36164b8c8abb02062.patch
Thanks for noticing, I had to update the patch, and git added me as author while generating the patch again. Will fix.
That sounds like you added the raw diff instead of checking out the git repo or importing the complete patches. Otherwise git keeps authorship info intact by default.
You're right. I guess I was confused because this is a vendor patch and I'm not sure If I could've used git to apply that raw patch I got off the upstream git repo (c/storage) because those files aren't there in git's index in c/podman. Please let me know if there's a better way to do this? Thanks
You could try
git am --directory vendor/github.com/containers/storagewith the patches from the storage repoThank you, that seems to have worked perfectly. Required the
--rejectflag for dealing with conflicts manually and then merging the 2 patches via stdout. Thanks!