[X2Go-Commits] [[X2Go Wiki]] page changed: events:start
A page in your DokuWiki was added or changed. Here are the details: Date: 2020/03/03 21:57 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:68.9) Gecko/20100101 Goanna/4.4 Firefox/68.9 PaleMoon/28.8.4 IP-Address : 78.43.58.112 Hostname: HSI-KBW-078-043-058-112.hsi4.kabel-badenwuerttemberg.de Old Revision: https://wiki.x2go.org/doku.php/events:start?rev=1583271458 New Revision: https://wiki.x2go.org/doku.php/events:start Edit Summary: [Tentative] Fixed sort order (by date) and narrowed down window for X2Go: The Gathering 2020 User: stefanbaur @@ -7,12 +7,12 @@ Tentative * LinuxDay.AT 2020 - some time around October-December 2020 (No CfP yet) * Hack4Glarus 2020.2 - 2020-12-04 - 2020-12-06? (No CfP yet) + * Linux Expo Ulm 2020 (together with Linux Presentation Day 2020.2), Ulm, Germany - if it takes place at all,it will be on 2020-11-21 * IT-Kongress 2020, Neu-Ulm, Germany - 2020-11-12 (No CfP yet) - * X2Go: The Gathering 2020, Linuxhotel, Essen, Germany - some time in Q3 or Q4 2020 + * X2Go: The Gathering 2020, Linuxhotel, Essen, Germany - some time in Q3 or Q4 2020 - NOT 2020-11 nor 2020-12 * OpenPOWER Summit Europe 2020, ??? - some time around September-October 2020 (No CfP yet) - * Linux Expo Ulm 2020 (together with Linux Presentation Day 2020.2), Ulm, Germany - if it takes place at all,it will be on 2020-11-21 * TUEBIX 2020, Tübingen, Germany - 2020-06-20 (No CfP yet) * Hack4Glarus 2020.1 - 2020-06-05 - 2020-06-07 (No CfP yet) * LinuxWochen Wien, Vienna, Austria - 2020-05-07 to 2020-05-09 (No CfP yet) * Linux-Info-Tag Augsburg, Augsburg, Germany - 2020-04-25 - Volunteers: Stefan, Mihai (CfP Deadline 31.03.2020 - https://pretalx.luga.de/lit-2020/cfp) -- This mail was generated by DokuWiki at https://wiki.x2go.org/ ___ x2go-commits mailing list x2go-commits@lists.x2go.org https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [[X2Go Wiki]] page changed: events:start
A page in your DokuWiki was added or changed. Here are the details: Date: 2020/03/03 21:37 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:68.9) Gecko/20100101 Goanna/4.4 Firefox/68.9 PaleMoon/28.8.4 IP-Address : 78.43.58.112 Hostname: HSI-KBW-078-043-058-112.hsi4.kabel-badenwuerttemberg.de Old Revision: https://wiki.x2go.org/doku.php/events:start?rev=1581775909 New Revision: https://wiki.x2go.org/doku.php/events:start Edit Summary: [Tentative] Added Date for Linux Expo Ulm 2020 / Linux Presentation Day 2020.2 User: stefanbaur @@ -10,9 +10,9 @@ * Hack4Glarus 2020.2 - 2020-12-04 - 2020-12-06? (No CfP yet) * IT-Kongress 2020, Neu-Ulm, Germany - 2020-11-12 (No CfP yet) * X2Go: The Gathering 2020, Linuxhotel, Essen, Germany - some time in Q3 or Q4 2020 * OpenPOWER Summit Europe 2020, ??? - some time around September-October 2020 (No CfP yet) - * Linux Expo Ulm 2020, Ulm, Germany - if it takes place at all + * Linux Expo Ulm 2020 (together with Linux Presentation Day 2020.2), Ulm, Germany - if it takes place at all,it will be on 2020-11-21 * TUEBIX 2020, Tübingen, Germany - 2020-06-20 (No CfP yet) * Hack4Glarus 2020.1 - 2020-06-05 - 2020-06-07 (No CfP yet) * LinuxWochen Wien, Vienna, Austria - 2020-05-07 to 2020-05-09 (No CfP yet) * Linux-Info-Tag Augsburg, Augsburg, Germany - 2020-04-25 - Volunteers: Stefan, Mihai (CfP Deadline 31.03.2020 - https://pretalx.luga.de/lit-2020/cfp) -- This mail was generated by DokuWiki at https://wiki.x2go.org/ ___ x2go-commits mailing list x2go-commits@lists.x2go.org https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] branch master updated (21569ee -> 2368d2f)
This is an automated email from the git hooks/post-receive script.
x2go pushed a change to branch master
in repository maintenancescripts.
from 21569ee git/hooks/x2go-post-receive-tag-pending: stop trying to
process revisions that do not feature a debian/changelog file.
new 51b8c4c git/hooks/x2go-post-receive-tag-pending: fix send_mail
"signature" comment.
new 2368d2f git/hooks/x2go-post-receive-tag-pending: actually use
${fixed_in_version} instead of the global ${version} variable in send_mail ().
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
git/hooks/x2go-post-receive-tag-pending | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/maintenancescripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 02/02: git/hooks/x2go-post-receive-tag-pending: actually use ${fixed_in_version} instead of the global ${version} variable in send_mail ().
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository maintenancescripts.
commit 2368d2fb137fee251c9e7095bd8e82b31a771a34
Author: Mihai Moldovan
Date: Tue Mar 3 19:40:09 2020 +0100
git/hooks/x2go-post-receive-tag-pending: actually use ${fixed_in_version}
instead of the global ${version} variable in send_mail ().
---
git/hooks/x2go-post-receive-tag-pending | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git/hooks/x2go-post-receive-tag-pending
b/git/hooks/x2go-post-receive-tag-pending
index 75d3824..e3b33a3 100755
--- a/git/hooks/x2go-post-receive-tag-pending
+++ b/git/hooks/x2go-post-receive-tag-pending
@@ -96,7 +96,7 @@ Content-Transfer-Encoding: 8bit
X-Mailer:
https://code.x2go.org/gitweb?p=maintenancescripts.git;a=blob;f=git/hooks/x2go-post-receive-tag-pending
tag #${bug} pending
-fixed #${bug} ${version}
+fixed #${bug} ${fixed_in_version}
thanks
Hi!
@@ -107,7 +107,7 @@ check the diff of the fix at:
${BASEURL};a=commitdiff;h=$(git show -s --pretty='format:%h' "${rev}")
-The issue will most likely be fixed in src:${PROJECT} (${version}).
+The issue will most likely be fixed in src:${PROJECT} (${fixed_in_version}).
light+love
X2Go Git Admin (on behalf of the sender of this mail)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/maintenancescripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 01/02: git/hooks/x2go-post-receive-tag-pending: fix send_mail "signature" comment.
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository maintenancescripts.
commit 51b8c4c6bd03bfa36b2b8ccc89377a66fb2953ac
Author: Mihai Moldovan
Date: Tue Mar 3 19:39:36 2020 +0100
git/hooks/x2go-post-receive-tag-pending: fix send_mail "signature" comment.
---
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 3961585..75d3824 100755
--- a/git/hooks/x2go-post-receive-tag-pending
+++ b/git/hooks/x2go-post-receive-tag-pending
@@ -73,7 +73,7 @@ case "${DPKG_VERSION}" in
;;
esac
-function send_mail () { # send_mail bugno revno diff_file
+function send_mail () { # send_mail bugno fixed_in_version revno diff_file
local bug="${1}"
local fixed_in_version="${2}"
local rev="${3}"
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/maintenancescripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] branch master updated (43956ee -> 21569ee)
This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from 43956ee git/hooks/x2go-post-receive-tag-pending: only execute on master and release branches. new 21569ee git/hooks/x2go-post-receive-tag-pending: stop trying to process revisions that do not feature a debian/changelog file. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/x2go-post-receive-tag-pending | 5 + 1 file changed, 5 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git ___ x2go-commits mailing list x2go-commits@lists.x2go.org https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 01/01: git/hooks/x2go-post-receive-tag-pending: stop trying to process revisions that do not feature a debian/changelog file.
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository maintenancescripts.
commit 21569ee256929ff5557ce4a0051f233c62dcfdb6
Author: Mihai Moldovan
Date: Tue Mar 3 14:45:54 2020 +0100
git/hooks/x2go-post-receive-tag-pending: stop trying to process revisions
that do not feature a debian/changelog file.
---
git/hooks/x2go-post-receive-tag-pending | 5 +
1 file changed, 5 insertions(+)
diff --git a/git/hooks/x2go-post-receive-tag-pending
b/git/hooks/x2go-post-receive-tag-pending
index ba84e25..3961585 100755
--- a/git/hooks/x2go-post-receive-tag-pending
+++ b/git/hooks/x2go-post-receive-tag-pending
@@ -160,6 +160,11 @@ while read oldrev newrev refname; do
${git_rev_list[@]} | \
while read rev; do
d="${tempdir}/${rev}.diff"
+# Check if this branch has a debian/changelog file to begin with and skip
processing if there's
+# none.
+if ! git cat-file -e "${rev}:debian/changelog" 2>/dev/null; then
+ continue
+fi
git show "${rev}" -- "debian/changelog" >"${d}"
version=$(get_version "${rev}" | sed -re 's/[0-9]+://' | cut -d"-" -f1)
bugs=$(get_bugs "${rev}")
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/maintenancescripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 08/08: git/hooks/x2go-post-receive-tag-pending: only execute on master and release branches.
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository maintenancescripts.
commit 4395665c10877e1f0b6c2513a975fd673a1b
Author: Mihai Moldovan
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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 03/08: git/hooks/x2go-post-receive-tag-pending: switch URL location to HTTPS.
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository maintenancescripts.
commit 14618d0165e662b955aee2ebedc584472fd1c76f
Author: Mihai Moldovan
Date: Tue Mar 3 13:21:07 2020 +0100
git/hooks/x2go-post-receive-tag-pending: switch URL location to HTTPS.
---
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 e10d611..5d9cfc3 100755
--- a/git/hooks/x2go-post-receive-tag-pending
+++ b/git/hooks/x2go-post-receive-tag-pending
@@ -23,7 +23,7 @@
set -e
set -u
-BASEURL="http://code.x2go.org/gitweb?p=${GIT_REPO_NAME};
+BASEURL="https://code.x2go.org/gitweb?p=${GIT_REPO_NAME};
PROJECT="${SHORT_GIT_REPO_NAME}"
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/maintenancescripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 05/08: git/hooks/x2go-post-receive-tag-pending: use more curly braces.
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository maintenancescripts.
commit c0de4b72f33ea9c0699dfcc8797cbcee074b3e46
Author: Mihai Moldovan
Date: Tue Mar 3 13:22:09 2020 +0100
git/hooks/x2go-post-receive-tag-pending: use more curly braces.
---
git/hooks/x2go-post-receive-tag-pending | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/git/hooks/x2go-post-receive-tag-pending
b/git/hooks/x2go-post-receive-tag-pending
index 137da6d..421ec3c 100755
--- a/git/hooks/x2go-post-receive-tag-pending
+++ b/git/hooks/x2go-post-receive-tag-pending
@@ -34,29 +34,29 @@ trap "rm -rf \"${tempdir}\"" EXIT
DPKG_VERSION="$(perl -MDpkg -e 'print $Dpkg::version')"
-case "$DPKG_VERSION" in
+case "${DPKG_VERSION}" in
1.16.*)
get_version()
{
-local rev="$1"
-local c="$tempdir/${rev}.changelog"
+local rev="${1}"
+local c="${tempdir}/${rev}.changelog"
-git show ${rev}:debian/changelog | sed -re 's/Fixes:/Closes:/i' > "$c"
2>/dev/null
-dpkg-parsechangelog -l"$c" | sed -rne 's/^Version: *//pi'
+git show ${rev}:debian/changelog | sed -re 's/Fixes:/Closes:/i' > "${c}"
2>/dev/null
+dpkg-parsechangelog -l"${c}" | sed -rne 's/^Version: *//pi'
}
get_bugs()
{
-local rev="$1"
-local c="$tempdir/${rev}.changelog"
+local rev="${1}"
+local c="${tempdir}/${rev}.changelog"
-git show ${rev}:debian/changelog | sed -re 's/Fixes:/Closes:/i' > "$c"
2>/dev/null
-dpkg-parsechangelog -l"$c" | sed -rne 's/^Closes: *//pi'
+git show ${rev}:debian/changelog | sed -re 's/Fixes:/Closes:/i' > "${c}"
2>/dev/null
+dpkg-parsechangelog -l"${c}" | sed -rne 's/^Closes: *//pi'
}
;;
*)
get_version()
{
-local rev="$1"
+local rev="${1}"
git show ${rev}:debian/changelog 2>/dev/null \
| sed -re 's/Fixes:/Closes:/i' \
@@ -64,7 +64,7 @@ case "$DPKG_VERSION" in
}
get_bugs()
{
-local rev="$1"
+local rev="${1}"
git show ${rev}:debian/changelog 2>/dev/null \
| sed -re 's/Fixes:/Closes:/i' \
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/maintenancescripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] branch master updated (bda1cea -> 43956ee)
This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from bda1cea git/hooks/x2go-post-receive-tag-pending: switch to using an array for process invocations. new 4ca837f git/hooks/x2go-post-receive-tag-pending: fix git rev-parse line and properly comment it. new 11eccf6 git/hooks/x2go-post-receive-tag-pending: fix new tag/branch git rev-list behavior. new 14618d0 git/hooks/x2go-post-receive-tag-pending: switch URL location to HTTPS. new 9fd00bd git/hooks/x2go-post-receive-tag-pending: quote new variable. new c0de4b7 git/hooks/x2go-post-receive-tag-pending: use more curly braces. new 45302e8 git/hooks/x2go-post-receive-tag-pending: reference actual tool location in X-Mailer header. new d7d6d9f git/hooks/x2go-post-receive-tag-pending: rework git rev-list call into something less duplicated. new 43956ee git/hooks/x2go-post-receive-tag-pending: only execute on master and release branches. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/x2go-post-receive-tag-pending | 65 - 1 file changed, 48 insertions(+), 17 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git ___ x2go-commits mailing list x2go-commits@lists.x2go.org https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 06/08: git/hooks/x2go-post-receive-tag-pending: reference actual tool location in X-Mailer header.
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
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/x2go-post-receive-tag-pending
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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 07/08: git/hooks/x2go-post-receive-tag-pending: rework git rev-list call into something less duplicated.
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository maintenancescripts.
commit d7d6d9f71645eb8190186d6ab4bed8b9085723ff
Author: Mihai Moldovan
Date: Tue Mar 3 13:49:06 2020 +0100
git/hooks/x2go-post-receive-tag-pending: rework git rev-list call into
something less duplicated.
---
git/hooks/x2go-post-receive-tag-pending | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/git/hooks/x2go-post-receive-tag-pending
b/git/hooks/x2go-post-receive-tag-pending
index a7311b3..cf6ac94 100755
--- a/git/hooks/x2go-post-receive-tag-pending
+++ b/git/hooks/x2go-post-receive-tag-pending
@@ -119,11 +119,13 @@ EOF
while read oldrev newrev refname; do
typeset -a git_rev_list
- git_rev_list=( 'git' 'rev-list' '--reverse' '--stdin' "${oldrev}..${newrev}"
)
+ git_rev_list=( 'git' 'rev-list' '--reverse' '--stdin' )
# 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}" )
+git_rev_list+=( "${newrev}" )
+ else
+git_rev_list+=( "${oldrev}..${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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 02/08: git/hooks/x2go-post-receive-tag-pending: fix new tag/branch git rev-list behavior.
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
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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 01/08: git/hooks/x2go-post-receive-tag-pending: fix git rev-parse line and properly comment it.
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
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
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
[X2Go-Commits] [maintenancescripts] 04/08: git/hooks/x2go-post-receive-tag-pending: quote new variable.
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository maintenancescripts.
commit 9fd00bd1470b0d5c59e8648aac793862b4fe7f60
Author: Mihai Moldovan
Date: Tue Mar 3 13:21:45 2020 +0100
git/hooks/x2go-post-receive-tag-pending: quote new variable.
---
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 5d9cfc3..137da6d 100755
--- a/git/hooks/x2go-post-receive-tag-pending
+++ b/git/hooks/x2go-post-receive-tag-pending
@@ -32,7 +32,7 @@ SENDMAIL="/usr/sbin/sendmail -oi -t"
tempdir="$(mktemp -d)"
trap "rm -rf \"${tempdir}\"" EXIT
-DPKG_VERSION=$(perl -MDpkg -e 'print $Dpkg::version')
+DPKG_VERSION="$(perl -MDpkg -e 'print $Dpkg::version')"
case "$DPKG_VERSION" in
1.16.*)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/maintenancescripts.git
___
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
