Merge branch '0329-superfluous-node' into 'main'

XEP-0329: Fix example 7, remove superfluous 'node' attribute

See merge request xsf/xeps!5

.gitlab-ci.yml

@@ -78,7 +78,7 @@ stages:
   script:
   - python3 tools/ci-restore-timestamps.py
   - make html inbox-html
-  - git fetch --depth=1 origin main
+  - git fetch --depth=50 origin main
   - bash tools/ci-changed-builds.sh origin/main
   rules:
   - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'

tools/ci-changed-builds.sh

@@ -1,7 +1,12 @@
 #!/bin/bash
 set -euo pipefail
 IFS=$'\n'
-filenames="$(git diff-tree -r --no-commit-id --name-only HEAD "$1" | ( grep -P '^(xep-[0-9]{4}|inbox/[^/]+)\.xml$' || true))"
+if ! merge_base="$(git merge-base "$1" HEAD)"; then
+    echo 'Failed to find merge base to detect changed files' >&2
+    echo 'This indicates that your branch is too old and needs to be rebased' >&2
+    exit 2
+fi
+filenames="$(git diff-tree -r --no-commit-id --name-status "$merge_base" HEAD | ( grep -P '^[AM]\t(xep-[0-9]{4}|inbox/[^/]+)\.xml$' || true) | cut -f2)"
 if [ -z "$filenames" ]; then
     exit 0
 fi

xep-0329.xml

@@ -32,6 +32,12 @@
       <jid>j.lagrange@jabber.org</jid>
   </author>
   &lance;
+  <revision>
+    <version>0.4.1</version>
+    <date>2020-06-14</date>
+    <initials>fs</initials>
+    <remark>Fix example 7, remove superfluous 'node' attribute</remark>
+  </revision>
   <revision>
     <version>0.4</version>
     <date>2017-09-11</date>
@@ -153,7 +159,7 @@
     from='romeo@montague.net/home'
     to='juliet@capulet.com/chamber'
     id='1236'>
-  <query xmlns="urn:xmpp:fis:0" node="test2.txt">
+  <query xmlns="urn:xmpp:fis:0">
     <file xmlns='urn:xmpp:jingle:apps:file-transfer:4'>
       <name>test2.txt</name>
       <size>1000</size>