From 1eb4d1f5ea990a46c7999e47b5a3263374bc2a5c Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 12 Feb 2021 23:07:49 -0700 Subject: [PATCH] secrets: fix subtle error with .gitkeep Add secrets .gitattributes to secrets dir and avoid encrypting it. Fixes an issue with .gitkeep causing build failures on unlocked repos. --- .gitattributes | 1 - secrets/.gitattributes | 2 ++ secrets/.gitkeep | Bin 22 -> 0 bytes 3 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 .gitattributes create mode 100644 secrets/.gitattributes delete mode 100644 secrets/.gitkeep diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 45b5ca3d..00000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -secrets/** filter=git-crypt diff=git-crypt diff --git a/secrets/.gitattributes b/secrets/.gitattributes new file mode 100644 index 00000000..5ccf582d --- /dev/null +++ b/secrets/.gitattributes @@ -0,0 +1,2 @@ +* filter=git-crypt diff=git-crypt +.gitattributes !filter !diff diff --git a/secrets/.gitkeep b/secrets/.gitkeep deleted file mode 100644 index 97257f7fbeb581ba1a950745ca8b0dce9ce242f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22 dcmZQ@_Y83kiVO&0*tY-t_i~@Q=i+-Lg#cV~2-pAs