diff options
| author | Joey Hess <joey@kitenet.net> | 2010-10-12 02:36:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-12 02:36:20 -0400 |
| commit | 739337c857303388ac11d66d15323286393dd981 (patch) | |
| tree | 66c92f6050772a64ef51bad06363ca490aebf93d /pre-commit.d | |
| parent | 29a3d7f06b2a5a45169445d0c1d2c9326269d652 (diff) | |
Do not warn about special files or hardlinks if they are ignored by git. Fixes #549354 for git, but not for other VCSs.
Diffstat (limited to 'pre-commit.d')
| -rwxr-xr-x | pre-commit.d/20warn-hardlinks | 10 | ||||
| -rwxr-xr-x | pre-commit.d/20warn-problem-files | 27 | ||||
| -rwxr-xr-x | pre-commit.d/20warn-special-file | 12 |
3 files changed, 27 insertions, 22 deletions
diff --git a/pre-commit.d/20warn-hardlinks b/pre-commit.d/20warn-hardlinks deleted file mode 100755 index 54b3887..0000000 --- a/pre-commit.d/20warn-hardlinks +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then - hardlinks=$(find . -type f -not -links 1 | grep -v '/\(.git\|.hg\|.bzr\|_darcs\)/' ) || true - if [ -n "$hardlinks" ]; then - echo "etckeeper warning: hardlinked files could cause problems with $VCS:" >&2 - echo "$hardlinks" >&2 - fi -fi diff --git a/pre-commit.d/20warn-problem-files b/pre-commit.d/20warn-problem-files new file mode 100755 index 0000000..3e9e476 --- /dev/null +++ b/pre-commit.d/20warn-problem-files @@ -0,0 +1,27 @@ +#!/bin/sh +set -e + +exclude_internal () { + grep -v '/\(.git\|.hg\|.bzr\|_darcs\)/' +} + +if [ "$VCS" = hg ] || [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then + special=$(find . -not -type d -not -type f -not -type l | exclude_internal) || true + hardlinks=$(find . -type f -not -links 1 | exclude_internal ) || true +elif [ "$VCS" = git ]; then + special=$(find . -not -type d -not -type f -not -type l -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true + hardlinks=$(find . -type f -not -links 1 -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true +else + special="" +fi + +if [ -n "$special" ]; then + echo "etckeeper warning: special files could cause problems with $VCS:" >&2 + echo "$special" >&2 +fi +if [ -n "$hardlinks" ]; then + echo "etckeeper warning: hardlinked files could cause problems with $VCS:" >&2 + echo "$hardlinks" >&2 +fi + +true diff --git a/pre-commit.d/20warn-special-file b/pre-commit.d/20warn-special-file deleted file mode 100755 index f246fb1..0000000 --- a/pre-commit.d/20warn-special-file +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then - special=$(find . -not -type d -not -type f -not -type l | grep -v '/\(.git\|.hg\|.bzr\|_darcs\)/') || true - if [ -n "$special" ]; then - echo "etckeeper warning: special files could cause problems with $VCS:" >&2 - echo "$special" >&2 - fi -fi - -true |