diff options
Diffstat (limited to 'tools/prepare-commit-msg')
| -rwxr-xr-x | tools/prepare-commit-msg | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/prepare-commit-msg b/tools/prepare-commit-msg index e103888a..ab351760 100755 --- a/tools/prepare-commit-msg +++ b/tools/prepare-commit-msg @@ -8,6 +8,12 @@ function add_ci_skip() { pattern="$1"; shift + source="$1" + + # Don't add [ci skip] if it's already in the commit message source + grep '\[ci skip\]' "$source" 2>&1 >/dev/null + [ $? -eq 0 ] && return + if [ $(git diff --cached --name-only | grep --count "$pattern") -eq 0 ]; then tempfile=$(mktemp $0.XXXXXX) cat - "$1" <<EOF > "$tempfile" @@ -19,9 +25,14 @@ function add_ci_skip() # comment or remove the next line. [ci skip] EOF - mv "$tempfile" "$1" + mv "$tempfile" "$source" fi } ## MAIN -add_ci_skip '\(^src\|^test\|^doc/ledger3.texi\|^\.travis.yml\|CMakeLists.txt\)' "$@" +file="$1" +source="$2" + +# Skip merge commits +[ "$source" = "merge" ] && exit 0 +add_ci_skip '\(^src\|^test\|^doc/ledger3.texi\|^\.travis.yml\|CMakeLists.txt\)' "$file" |