diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-06-02 11:18:21 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-06-02 11:18:21 +0100 |
| commit | 9127b5239871fb1e16f26abb17081599b38a4d53 (patch) | |
| tree | bcd4426ab4be89bd3d7503f06bf6af0c360563ae /contrib | |
| parent | 871e5ada6d53d5eb495cc9f323983f347487c1b2 (diff) | |
contrib: Make prepare-commit-msg hook safe for older branches
If a user installs this script as .git/hooks/prepare-commit-msg and then
works on an old branch which doesn't have the mklog.py script, trying to
commit will fail with an error like:
environment: /.../gcc/contrib/mklog.py: No such file or directory
This makes it exit cleanly so it's possible to commit.
contrib/ChangeLog:
* prepare-commit-msg: Do nothing if the mklog.py script isn't
present.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/prepare-commit-msg | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/prepare-commit-msg b/contrib/prepare-commit-msg index fd59bfbcf88..24f0783aae2 100755 --- a/contrib/prepare-commit-msg +++ b/contrib/prepare-commit-msg @@ -23,6 +23,9 @@ COMMIT_MSG_FILE=$1 COMMIT_SOURCE=$2 SHA1=$3 +# We might be on a branch before the file was added. +if ! [ -x contrib/mklog.py ]; then exit 0; fi + # Can't do anything if $COMMIT_MSG_FILE isn't a file. if ! [ -f "$COMMIT_MSG_FILE" ]; then exit 0; fi |