Kaydet (Commit) 677b4402 authored tarafından Miklos Vajna's avatar Miklos Vajna

g: fix --set-push-urls

1) submodule's .git is possibly a file now

2) just use the logerrit alias, as

   - logerrit setup already set that up
   - possibly otherwise the right ssh key is not picked up

Change-Id: I4fb355a7f7ec7d549d2b06367f4fd10d06086374
üst 2add63d2
......@@ -115,9 +115,9 @@ local repo
fi
echo "setting up push url for ${repo?}"
if [ "${repo?}" = "helpcontent2" ] ; then
git config remote.origin.pushurl "ssh://${PUSH_USER}gerrit.libreoffice.org:29418/help"
git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/help"
else
git config remote.origin.pushurl "ssh://${PUSH_USER}gerrit.libreoffice.org:29418/${repo?}"
git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/${repo?}"
fi
popd > /dev/null
}
......@@ -137,7 +137,7 @@ SUBMODULES_ACTIVE=""
local repo
for repo in ${SUBMODULES_ALL?} ; do
if [ -d ${repo?}/.git ] ; then
if [ -d ${repo?}/.git -o -f ${repo?}/.git ] ; then
SUBMODULES_ACTIVE="${repo?} ${SUBMODULES_ACTIVE?}"
fi
done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment