summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2015-12-07 09:11:32 -0500
committerNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2015-12-07 09:11:32 -0500
commitd60c46920b3a157bf1825239680a5ea2fb522f0e (patch)
treef57b86fdb42c8f20762c6437bb1f570449755cbb
parent271093d6338f01501fc0bb1965e90f6b441f62fb (diff)
Automatic update of common submodule
From b319909 to 86e4663
-rwxr-xr-xautogen.sh6
m---------common0
2 files changed, 5 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh
index 60d24e9..7e41aa6 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