diff options
| author | Scott Bronson <b.git@u32.net> | 2008-03-17 00:02:45 -0700 |
|---|---|---|
| committer | Scott Bronson <b.git@u32.net> | 2008-03-17 00:02:45 -0700 |
| commit | 1deff7a3d8de37cba44d4e1cdf1af9f768ee6011 (patch) | |
| tree | 234469f8e7ec06993f00c324c2803d0ccc1889ca /pre-commit.d | |
| parent | 60f110f04f4d66e80cdade875f76aa11c77b0b3b (diff) | |
| parent | 43f7458353755aebfc90045890fabefc95910c28 (diff) | |
Merge branch 'master' of git://git.kitenet.net/etckeeper
Diffstat (limited to 'pre-commit.d')
| -rwxr-xr-x | pre-commit.d/20store-empty-directory | 4 | ||||
| -rwxr-xr-x | pre-commit.d/20warn-hardlinks | 2 | ||||
| -rwxr-xr-x | pre-commit.d/20warn-special-file | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pre-commit.d/20store-empty-directory b/pre-commit.d/20store-empty-directory index a52a383..22fde89 100755 --- a/pre-commit.d/20store-empty-directory +++ b/pre-commit.d/20store-empty-directory @@ -11,8 +11,8 @@ if [ "$VCS" = git ] || [ "$VCS" = hg ]; then if [ -e .etckeeper ]; then egrep -v '^mkdir ' .etckeeper > .etckeeper.new || true fi - find -type d -empty | grep -v /.git/ | grep -v /.hg/ | sort | - sed -e "s/^/mkdir -p '/" -e "s/\$/'/" >> .etckeeper.new + find -type d -empty | grep -v /.git/ | grep -v /.hg/ | grep -v /.bzr/ | + sort | sed -e "s/^/mkdir -p '/" -e "s/\$/'/" >> .etckeeper.new if [ ! -e .etckeeper ] || ! cmp -s .etckeeper .etckeeper.new ; then mv -f .etckeeper.new .etckeeper diff --git a/pre-commit.d/20warn-hardlinks b/pre-commit.d/20warn-hardlinks index e82740a..c1fd8f7 100755 --- a/pre-commit.d/20warn-hardlinks +++ b/pre-commit.d/20warn-hardlinks @@ -2,7 +2,7 @@ set -e if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ]; then - hardlinks=$(find -type f -not -links 1 | grep -v /.git/) || true + hardlinks=$(find -type f -not -links 1 | grep -v /.git/ | grep -v /.hg/ | grep -v /.bzr/) || true if [ -n "$hardlinks" ]; then echo "etckeeper warning: hardlinked files could cause problems with $VCS:" >&2 echo "$hardlinks" >&2 diff --git a/pre-commit.d/20warn-special-file b/pre-commit.d/20warn-special-file index 0835687..5712bc5 100755 --- a/pre-commit.d/20warn-special-file +++ b/pre-commit.d/20warn-special-file @@ -2,7 +2,7 @@ set -e if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ]; then - special=$(find -not -type d -not -type f -not -type l | grep -v /.git/) || true + special=$(find -not -type d -not -type f -not -type l | grep -v /.git/ | grep -v /.hg/ | grep -v /.bzr/) || true if [ -n "$special" ]; then echo "etckeeper warning: special files could cause problems with $VCS:" >&2 echo "$special" >&2 |