diff options
author | Rob Austein <sra@hactrn.net> | 2019-01-09 11:07:05 -0500 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2019-01-09 11:07:05 -0500 |
commit | 9590720514b597c66f9524eef6615335e766091a (patch) | |
tree | 05ba16c8ffb3b76943a40486d9603e87c46b0f79 | |
parent | 833921d5f0f2c7a62594b134e6d756abd5ec012e (diff) | |
parent | 1ad1120086e4d9f6599555ed2ea6a54994ec8e1b (diff) |
Clean-up ill-advised fork of core/cipher/aes.
For reasons which seemed to make sense at the time but of which he has
long since repented, Joachim forked the core/cipher/aes repository to
a new core/cipher/aes_speed repository rather than just branching.
After some discussion, we decided to repair this.
Summary of repair:
1) Create new empty repository, add both core/cipher/aes and
core/cipher/aes_speed as remotes.
2) Identify commit in core/cipher/aes from which core/cipher/aes_speed
was forked (determined by log inspection and comparison of the diff
size between commits in aes/master and aes_speed/master).
3) Splice the trees using a terrifying git command:
git checkout -b master aes_speed/master
git filter-branch \
--commit-filter 'git commit-tree -S${keyid} "$@"' \
--parent-filter "sed 's/^\$/-p ${fork_point}/'" \
master
where ${keyid} is the GPG key ID of the person doing the repair
work and ${fork_point} is the ID of the commit in core/cipher/aes
from which core/cipher/aes_speed was forked.
4) Merge the filtered master branch created above to aes/master with
`-s our` so that the master branch going forward will be the
content from core/cipher/aes_speed.
0 files changed, 0 insertions, 0 deletions