This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 11eccf6af8d144cd95c46a6ffb8c54e33c829083 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Mar 2 11:05:39 2020 +0100 git/hooks/x2go-post-receive-tag-pending: fix new tag/branch git rev-list behavior. Excluding anything in that call is useless, since we already do so with the git rev-parse call before and actually counter-productive, since it also excludes the branch the new refs are based on, leading to it effectively becoming a nop. --- git/hooks/x2go-post-receive-tag-pending | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/hooks/x2go-post-receive-tag-pending b/git/hooks/x2go-post-receive-tag-pending index e2d2a2e..e10d611 100755 --- a/git/hooks/x2go-post-receive-tag-pending +++ b/git/hooks/x2go-post-receive-tag-pending @@ -123,7 +123,7 @@ while read oldrev newrev refname; do # For new branches/tags, do something special. Hopefully. typeset null_regex='^0{20,}$' if [[ "${oldrev}" =~ ${null_regex} ]]; then - git_rev_list=( 'git' 'rev-list' '--reverse' '--stdin' "${newrev}" '--not' '--branches=*' '--tags=*' ) + git_rev_list=( 'git' 'rev-list' '--reverse' '--stdin' "${newrev}" ) fi # Be careful with the "git rev-parse" line. # It is supposed to filter out any commits that are already part of a (different) branch or tag, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 4ca837fdb81ab08553b32cf6ced67a52d608faa0 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Mar 2 11:00:44 2020 +0100 git/hooks/x2go-post-receive-tag-pending: fix git rev-parse line and properly comment it. The previous specification was utterly wrong and included refs that shouldn't have been touched at all. The crucial part is that we only want that call to emit negated entries, essentially spanning any tag or branch which the new commits are not part of, in order to avoid sending duplicated mails in case of merge operations. The original call did something entirely different - it correctly excluded tags, but included the master and release branches during each individual run, which is not what we wanted. --- git/hooks/x2go-post-receive-tag-pending | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/git/hooks/x2go-post-receive-tag-pending b/git/hooks/x2go-post-receive-tag-pending index d796e2f..e2d2a2e 100755 --- a/git/hooks/x2go-post-receive-tag-pending +++ b/git/hooks/x2go-post-receive-tag-pending @@ -125,7 +125,18 @@ while read oldrev newrev refname; do if [[ "${oldrev}" =~ ${null_regex} ]]; then git_rev_list=( 'git' 'rev-list' '--reverse' '--stdin' "${newrev}" '--not' '--branches=*' '--tags=*' ) fi - git rev-parse --not --tags --not --branches='master' --branches='release/*' | grep -v "$(git rev-parse ${refname})" | \ + # Be careful with the "git rev-parse" line. + # It is supposed to filter out any commits that are already part of a (different) branch or tag, + # in order to not cause duplicated mails on merges. + # For this to work, git rev-parse spits out a list of negated tip refs (one per tag/branch), which + # are later ignored by git rev-list - including all predecessors. + # Since this script runs as a post-receive one, there's one caveat: it will execute after all + # branches have been updated, so the new ref(s) will already be incorporated as the new tips of + # their respective branches. Incidentally, this means that the pushed tip would be getting + # ignored as well, defeating the script's purpose. Hence, we'll manually filter out the negated tip + # ref of the current branch (i.e., refname) we're interested in, keeping that one (and that one + # only) in the loop. + git rev-parse --not --tags --branches | grep -v "$(git rev-parse ${refname})" | \ ${git_rev_list[@]} | \ while read rev; do d="${tempdir}/${rev}.diff" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 45302e81ec93d414f2bc0f42173164e7bdc61a59 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 3 13:27:46 2020 +0100 git/hooks/x2go-post-receive-tag-pending: reference actual tool location in X-Mailer header. --- git/hooks/x2go-post-receive-tag-pending | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/hooks/x2go-post-receive-tag-pending b/git/hooks/x2go-post-receive-tag-pending index 421ec3c..a7311b3 100755 --- a/git/hooks/x2go-post-receive-tag-pending +++ b/git/hooks/x2go-post-receive-tag-pending @@ -93,7 +93,7 @@ Subject: X2Go issue (in src:${PROJECT}) has been marked as pending for release Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit -X-Mailer: https://x2go.org/post-receive-tag-pending +X-Mailer: https://code.x2go.org/gitweb?p=maintenancescripts.git;a=blob;f=git/hooks/x2g... tag #${bug} pending fixed #${bug} ${version} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 43956eeee65c10877e1f0b6c2513a975fd673a1b Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 3 14:23:47 2020 +0100 git/hooks/x2go-post-receive-tag-pending: only execute on master and release branches. This should mostly restore the original behavior, including correct operation in the case of merges, which was actually broken before. --- git/hooks/x2go-post-receive-tag-pending | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/git/hooks/x2go-post-receive-tag-pending b/git/hooks/x2go-post-receive-tag-pending index cf6ac94..ba84e25 100755 --- a/git/hooks/x2go-post-receive-tag-pending +++ b/git/hooks/x2go-post-receive-tag-pending @@ -118,6 +118,20 @@ EOF } while read oldrev newrev refname; do + # Only process master or release branches. + # Others will not be processed, so any commits containing a Fixes/Closes statement as part + # of all the other branches will be silently ignored. + case "${refname}" in + ("refs/heads/master") + : + ;; + ("refs/heads/release/"*) + : + ;; + (*) + continue + ;; + esac typeset -a git_rev_list git_rev_list=( 'git' 'rev-list' '--reverse' '--stdin' ) # For new branches/tags, do something special. Hopefully. @@ -138,7 +152,11 @@ while read oldrev newrev refname; do # ignored as well, defeating the script's purpose. Hence, we'll manually filter out the negated tip # ref of the current branch (i.e., refname) we're interested in, keeping that one (and that one # only) in the loop. - git rev-parse --not --tags --branches | grep -v "$(git rev-parse ${refname})" | \ + # However, since we want to ignore bug fix tags in changelog entries on all branches other than the + # master and release branches and only process them after they have been merged into master/release + # branches, we'll have to include only the latter. Merges from other branches will hence trigger + # emails the first time they are encountered. + git rev-parse --not --tags 'refs/heads/master' --branches='release/*' | grep -v "$(git rev-parse ${refname})" | \ ${git_rev_list[@]} | \ while read rev; do d="${tempdir}/${rev}.diff" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git