g | 12 ++++++++++++
1 file changed, 12 insertions(+)
New commits:
commit 0e6e10cd3dd5a6bf06000750a74982a9824ec853
Author: Mike Kaganski <mikekagan...@hotmail.com>
AuthorDate: Thu Mar 4 11:40:05 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Mar 4 15:16:55 2021 +0100
Workaround a problem in Git for Windows' bash
... where running './g pull -r' resulted in
ln: failed to create symbolic link '.git/modules/dictionaries/hooks/*':
No such file or directory
ln: failed to create symbolic link '.git/modules/translations/hooks/*':
No such file or directory
Change-Id: Ie0bd2eaca44f8b1a2ad2de9083bbefc779e213e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111948
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/g b/g
index 746babe23539..918292eb3ee6 100755
--- a/g
+++ b/g
@@ -38,6 +38,9 @@ refresh_submodule_hooks()
if [ -d "${repo?}"/.git ] ; then
# use core's hook by default
for hook_name in "${COREDIR?}/.git-hooks"/* ; do
+ if [ ! -e "${hook_name}" ] ; then
+ continue
+ fi
hook="${repo?}/.git/hooks/${hook_name##*/}"
if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
rm -f "${hook?}"
@@ -46,6 +49,9 @@ refresh_submodule_hooks()
done
# override if need be by the submodules' own hooks
for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
+ if [ ! -e "${hook_name}" ] ; then
+ continue
+ fi
hook="${repo?}/.git/hooks/${hook_name##*/}"
if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
rm -f "${hook?}"
@@ -54,6 +60,9 @@ refresh_submodule_hooks()
done
elif [ -d .git/modules/"${repo}"/hooks ] ; then
for hook_name in "${COREDIR?}/.git-hooks"/* ; do
+ if [ ! -e "${hook_name}" ] ; then
+ continue
+ fi
hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
rm -f "${hook?}"
@@ -62,6 +71,9 @@ refresh_submodule_hooks()
done
# override if need be by the submodules' own hooks
for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
+ if [ ! -e "${hook_name}" ] ; then
+ continue
+ fi
hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
rm -f "${hook?}"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
