diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2015-12-07 09:08:09 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2015-12-07 09:08:09 -0500 |
| commit | 8a7eaeb2372f544964f5ce350ceb2a8166670eb5 (patch) | |
| tree | 69dfa722142dc6eee6e1f4235687f6aabdfce40e | |
| parent | b13b80ea3984ecc21c1fb8430e9508fcfce0802a (diff) | |
Automatic update of common submodule
| -rwxr-xr-x | autogen.sh | 6 | ||||
| m--------- | common | 0 |
2 files changed, 5 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh index f7c047f28..3d821a8c9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -37,7 +37,11 @@ fi if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \); then rm -f .git/hooks/pre-commit - ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit + if ! ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit 2> /dev/null + then + echo "Failed to create commit hook symlink, copying instead ..." + cp common/hooks/pre-commit.hook .git/hooks/pre-commit + fi fi # GNU gettext automake support doesn't get along with git. diff --git a/common b/common -Subproject b3199090fa16a545d585a54deaa61b687ac369e +Subproject 86e46630ed8af8d94796859db550a9c3d89c9f6 |