Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions transcrypt
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ git_pre_commit() {
# Add file patterns to .gitattributes
add_pattern() {
for var in "$@"; do
line="$var filter=crypt${CONTEXT_CRYPT_SUFFIX} diff=crypt${CONTEXT_CRYPT_SUFFIX} merge=crypt${CONTEXT_CRYPT_SUFFIX}"
grep -qxF "$line" "${GIT_ATTRIBUTES}" || echo "$line" >>"${GIT_ATTRIBUTES}"
line="$var filter=crypt${CONTEXT_CRYPT_SUFFIX} diff=crypt${CONTEXT_CRYPT_SUFFIX} merge=crypt${CONTEXT_CRYPT_SUFFIX} -delta"
echo "$line" >>"${GIT_ATTRIBUTES}"
sync
done
}
Expand Down Expand Up @@ -1349,7 +1349,7 @@ help() {
$ transcrypt --add sensitive_file

$ cat .gitattributes
sensitive_file filter=crypt diff=crypt merge=crypt
sensitive_file filter=crypt diff=crypt merge=crypt -delta

$ git add .gitattributes sensitive_file
$ git commit -m 'Add encrypted version of a sensitive file'
Expand Down Expand Up @@ -1383,7 +1383,7 @@ help() {
$ transcrypt --context=super --add=top-secret

$ cat .gitattributes
top-secret filter=crypt-super diff=crypt-super merge=crypt-super
top-secret filter=crypt-super diff=crypt-super merge=crypt-super -delta

# Add and commit your top-secret and .gitattribute files
$ git add .gitattributes top-secret
Expand Down Expand Up @@ -1684,7 +1684,7 @@ fi
# ensure the git attributes file exists
if [[ ! -f $GIT_ATTRIBUTES ]]; then
mkdir -p "${GIT_ATTRIBUTES%/*}"
printf '#pattern filter=crypt diff=crypt merge=crypt\n' >"$GIT_ATTRIBUTES"
printf '#pattern filter=crypt diff=crypt merge=crypt -delta\n' >"$GIT_ATTRIBUTES"
fi

printf 'The repository has been successfully configured by transcrypt%s.\n' "$CONTEXT_DESCRIPTION"
Expand Down
Loading