diff options
| author | Craig Earls <enderw88@gmail.com> | 2015-01-24 15:52:07 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2015-01-24 15:52:07 -0700 |
| commit | 204568d5145c77b3cf3bccd49c9ad6780b4b1fe1 (patch) | |
| tree | 65a8d2f5dba1c5e6f16aeec938dbfe6928a9128e /tools/prepare-commit-msg | |
| parent | 3b56134a546146718938929edf5e40e3ca1fc87d (diff) | |
| parent | d94d164b65258d2867245a63877ca75ec3bd471a (diff) | |
| download | fork-ledger-204568d5145c77b3cf3bccd49c9ad6780b4b1fe1.tar.gz fork-ledger-204568d5145c77b3cf3bccd49c9ad6780b4b1fe1.tar.bz2 fork-ledger-204568d5145c77b3cf3bccd49c9ad6780b4b1fe1.zip | |
Merge commit 'd94d164b65258d2867245a63877ca75ec3bd471a' into next
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" |