Of course all filenames in .etckeeper should be surrounded by quotes.

diff --git a/pre-commit.d/30store-metadata b/pre-commit.d/30store-metadata
index 65040bf89704c5eb2b36062682acf330aa4e0519..c3927e0bbeee2995c84287c9e7f749055fac5f50 100755 (executable)
--- a/pre-commit.d/30store-metadata
+++ b/pre-commit.d/30store-metadata
@@ -33,20 +33,20 @@ generate_metadata() {
        fi
 
        # Find all files and directories that don't have root as the owner
-       find $NOVCS \! -user root -exec stat --format="chown %U {}" {} \; \
+       find $NOVCS \! -user root -exec stat --format="chown %U '{}'" {} \; \
                | sort | filter_unknown chown owner
        # Find all files and directories that don't have root as the group
-       find $NOVCS \! -group root -exec stat --format="chgrp %G {}" {} \; \
+       find $NOVCS \! -group root -exec stat --format="chgrp %G '{}'" {} \; \
                | sort | filter_unknown chgrp group
 
        # Find all directories that aren't 0755
        find $NOVCS -type d \! -perm 0755 \
-               -exec stat --format="chmod %a {}" {} \; | sort
+               -exec stat --format="chmod %a '{}'" {} \; | sort
 
        # Find all files that aren't 0644 or 0755 (we can assume the VCS will
        # maintain the executable bit).
        find $NOVCS -type f \! -perm 0644 \! -perm 0755 \
-               -exec stat --format="chmod %a {}" {} \; | sort
+               -exec stat --format="chmod %a '{}'" {} \; | sort
 
        # We don't handle xattrs.
        # Maybe check for getfattr/setfattr and use them if they're available?
@@ -62,7 +62,7 @@ if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ]; then
                chmod 700 .etckeeper
        fi
 
-       echo "# Generated by etckeeper." > .etckeeper
+       echo "# Generated by etckeeper.  Do not edit." > .etckeeper
        echo >> .etckeeper
        generate_metadata >> .etckeeper