]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5f0a82a) | patch
ceph-backport.sh: cherry-pick individual commits
authorJan Fajerski <jfajerski@suse.com>
Tue, 3 Sep 2019 11:26:20 +0000 (13:26 +0200)
committerJan Fajerski <jfajerski@suse.com>
Tue, 3 Sep 2019 13:14:15 +0000 (15:14 +0200)
commitb55932a590d19da9fabf5a780f365ed473cfca9f
tree4628275b4c316b46f610d695092ce136a33a15a7tree | snapshot
parent5f0a82a01dff3c36f5cb94ca735006075307aad0commit | diff
ceph-backport.sh: cherry-pick individual commits

In git 2.23.0 (possibly earlier too) cherry-pick seems to interact with
rev-list and submodules in unexpected ways, where the cherry-pick of a
commit range (<sha1>..<sha1>) fails with "changes would be overwritten"
in a submodule. CP'ing individual commits avoids this.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
src/script/ceph-backport.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.