This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 6eb421b4b294446df7536356f9f3a10435a49a8e Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 1 16:08:11 2020 +0100 git/hooks/update-irkerhook_only: add logic to handle new branches/tags gracefully. --- git/hooks/update-irkerhook_only | 47 ++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/git/hooks/update-irkerhook_only b/git/hooks/update-irkerhook_only index 790f42b..265b7c5 100755 --- a/git/hooks/update-irkerhook_only +++ b/git/hooks/update-irkerhook_only @@ -11,28 +11,37 @@ NEW="${3}" typeset -i merge="0" typeset -i ff="0" +typeset -i new='0' -if [ -z "$(git rev-list --merges "${OLD}..${NEW}")" ]; then - merge="0" +if [ '000000000000000000000000000000000000000000' = "${OLD}" ]; then + new='1' else - merge="1" -fi + if [ -z "$(git rev-list --merges "${OLD}..${NEW}")" ]; then + merge="0" + else + merge="1" + fi -typeset merge_base="$(git merge-base "${OLD}" "${NEW}")" -if [ "${merge_base}" = "${OLD}" ]; then - ff="1" -else - ff="0" + typeset merge_base="$(git merge-base "${OLD}" "${NEW}")" + if [ "${merge_base}" = "${OLD}" ]; then + ff="1" + else + ff="0" + fi fi -if [ "${ff}" -eq "1" ] && [ "${merge}" -eq "0" ]; then - git rev-list --reverse "${OLD}..${NEW}" | while read cur_rev; do - "${OUTSIDE_REPO}/update-script._irkerhook.py_" --refname="${REFNAME}" "${cur_rev}" --repo="${SHORT_GIT_REPO_NAME}" || : - done -elif [ "${merge}" -eq "1" ]; then - git rev-list --reverse "${NEW}^..${NEW}" | while read cur_rev; do - "${OUTSIDE_REPO}/update-script._irkerhook.py_" --refname="${REFNAME}" "${cur_rev}" --repo="${SHORT_GIT_REPO_NAME}" || : - done -elif [ "${ff}" -eq "0" ]; then - "${OUTSIDE_REPO}/update-script._irkerhook.py_" --refname="${REFNAME}" --rebase="${OLD}" "${NEW}" --repo="${SHORT_GIT_REPO_NAME}" || : +if [ '1' -eq "${new}" ]; then + "${OUTSIDE_REPO}/update-script._irkerhook.py_" --refname="${REFNAME}" "${cur_rev}" --new=true --repo="${SHORT_GIT_REPO_NAME}" || : +else + if [ "${ff}" -eq "1" ] && [ "${merge}" -eq "0" ]; then + git rev-list --reverse "${OLD}..${NEW}" | while read cur_rev; do + "${OUTSIDE_REPO}/update-script._irkerhook.py_" --refname="${REFNAME}" "${cur_rev}" --repo="${SHORT_GIT_REPO_NAME}" || : + done + elif [ "${merge}" -eq "1" ]; then + git rev-list --reverse "${NEW}^..${NEW}" | while read cur_rev; do + "${OUTSIDE_REPO}/update-script._irkerhook.py_" --refname="${REFNAME}" "${cur_rev}" --repo="${SHORT_GIT_REPO_NAME}" || : + done + elif [ "${ff}" -eq "0" ]; then + "${OUTSIDE_REPO}/update-script._irkerhook.py_" --refname="${REFNAME}" --rebase="${OLD}" "${NEW}" --repo="${SHORT_GIT_REPO_NAME}" || : + fi fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git