diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-07-07 15:32:23 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-07-07 15:32:23 +0200 |
| commit | ad229124e445457cc70ca66c97af3f98c95c05db (patch) | |
| tree | 2ca1a601e080dfb7edffb842ab8b34c8ce249214 /pre-commit.d/30store-metadata | |
| parent | 03754659d6381ac95d4d5e8dc612d3ad6865b581 (diff) | |
| parent | 9fab4273a50b1ffe6c13d7e6ca9da0174ae27084 (diff) | |
Merge branch 'master' of git://git.kitenet.net/etckeeper into bzrplugin
Diffstat (limited to 'pre-commit.d/30store-metadata')
| -rwxr-xr-x | pre-commit.d/30store-metadata | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pre-commit.d/30store-metadata b/pre-commit.d/30store-metadata index bed2d89..243e019 100755 --- a/pre-commit.d/30store-metadata +++ b/pre-commit.d/30store-metadata @@ -1,7 +1,6 @@ #!/bin/sh set -e - # Filters out UNKNOWN users and groups, prints a warning on stderr. filter_unknown() { CMD=$1 @@ -15,7 +14,6 @@ filter_unknown() { done } - generate_metadata() { # This function generates the script commands to fix any files # that aren't owner=root, group=root, or mode=0644 or 0755. @@ -25,6 +23,10 @@ generate_metadata() { # but we want find to ignore the VCS files themselves. NOVCS='. -wholename ./.git -prune -o -wholename ./.bzr -prune -o -wholename ./.hg -prune -o' + # Keep the sort order the same at all times. + LC_COLLATE=C + export LC_COLLATE + if [ "$VCS" = git ] || [ "$VCS" = hg ]; then # These version control systems do not track directories, # so empty directories must be stored specially. @@ -52,7 +54,6 @@ generate_metadata() { # Maybe check for getfattr/setfattr and use them if they're available? } - if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ]; then if [ -f .metadata ]; then # remove obsolete .metadata file |