Update transcrypt for merge and pre-commit features #23
Conversation
Update the `transcrypt` encryption utility to be based on upstream's version 1.1.0 but also with new features from our IC fork: - on init, add a merge driver to properly handle merge of secrets files with conflicting changes: ixc/transcrypt#1 The .gitattributes file is also adjusted to apply the merge driver. - on init, add a Git pre-commit hook script to abort commit if raw content of a secrets file is not properly encrypted: ixc/transcrypt#2 - cherry-picked upstream fix to silence spurious warnings: github.com/elasticdog/transcrypt/commit/9a8a1f Script sourced from ixc/transcrypt@e9e1d96c
|
Hi @Aramgutang and @mrmachine these IC-specific improvements to But since this involves both encryption and git magic – both things very easy to stuff up – it would benefit from some review or testing before we start rolling it out to future sites or upgraded sites. |
|
I don't think I have the domain knowledge to provide useful feedback, I'm afraid. |
|
@Aramgutang if you're keen you could follow the reproduction steps in that Stack Overflow question to compare results of the old or new scripts, but no problem if you're not so keen |
|
I don't use |
Update the `transcrypt` encryption utility with latest fix for merging of encrypted files from our IC fork. The script is from https://github.com/ixc/ at 31c63750
|
This PR was made redundant by f3c2daf |
Update the
transcryptencryption utility to bebased on upstream's version 1.1.0 but also with
new features from our IC fork:
merge of secrets files with conflicting changes:
Fix merge of encrypted files with conflicts transcrypt#1
The .gitattributes file is also adjusted to
apply the merge driver.
abort commit if raw content of a secrets file
is not properly encrypted:
Add Git pre-commit hook to abort commit with unencrypted files transcrypt#2
warnings:
http://github.com/elasticdog/transcrypt/commit/9a8a1f
Script sourced from
ixc/transcrypt@e9e1d96c