diff options
| author | Craig Earls <enderw88@gmail.com> | 2015-02-25 22:01:33 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2015-02-25 22:01:33 -0700 |
| commit | 1f803d629491991afb8aa9cd1d159313b2af78c7 (patch) | |
| tree | 4eb6f0f90162f4808d0687a06ad1a698eb3ed035 /tools | |
| parent | fe48f607be7b9da8d2c4ac1fb30078dea55b8240 (diff) | |
| parent | af0da737fc4ef8f9ccebd3d43519610b8a8fcaa1 (diff) | |
| download | fork-ledger-1f803d629491991afb8aa9cd1d159313b2af78c7.tar.gz fork-ledger-1f803d629491991afb8aa9cd1d159313b2af78c7.tar.bz2 fork-ledger-1f803d629491991afb8aa9cd1d159313b2af78c7.zip | |
Merge commit 'af0da737fc4ef8f9ccebd3d43519610b8a8fcaa1' into next
Conflicts:
lisp/ledger-reconcile.el
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/prepare-commit-msg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/prepare-commit-msg b/tools/prepare-commit-msg index ab351760..d2f927c0 100755 --- a/tools/prepare-commit-msg +++ b/tools/prepare-commit-msg @@ -5,17 +5,17 @@ # Add [ci skip] to the commit message unless there are changes to files # that are relevant for testing such as src/*, test/*, ledger3.texi, ... -function add_ci_skip() +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 + grep '\[ci skip\]' "$source" >/dev/null 2>&1 [ $? -eq 0 ] && return if [ $(git diff --cached --name-only | grep --count "$pattern") -eq 0 ]; then - tempfile=$(mktemp $0.XXXXXX) + tempfile=$(mktemp "${0}.XXXXXX") cat - "$1" <<EOF > "$tempfile" # It seems the changes to be committed are irrelevant for the continuous |