diff --git a/lib/functions.php b/lib/functions.php index a9c8062..9f63606 100755 --- a/lib/functions.php +++ b/lib/functions.php @@ -65,13 +65,13 @@ function writeBirdConfig ($roas) $bird2_fq4 = fopen ('roa/bird4_route_dn42.conf', 'w'); $bird2_fq6 = fopen ('roa/bird6_route_dn42.conf', 'w'); - fwrite ($bird1_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 | sed 's/^/# /g'")); - fwrite ($bird1_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 | sed 's/^/# /g'")); - fwrite ($bird1_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 | sed 's/^/# /g'")); + fwrite ($bird1_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird1_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird1_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); - fwrite ($bird2_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 | sed 's/^/# /g'")); - fwrite ($bird2_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 | sed 's/^/# /g'")); - fwrite ($bird2_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 | sed 's/^/# /g'")); + fwrite ($bird2_fq, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird2_fq4, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); + fwrite ($bird2_fq6, shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges | sed 's/^/# /g'")); foreach ($roas["roas"] as $roa) { diff --git a/rfc8416.php b/rfc8416.php index 5c4788b..b03bad7 100755 --- a/rfc8416.php +++ b/rfc8416.php @@ -6,11 +6,11 @@ require ("lib/functions.php"); // Define array() we are going to populate with data. $roas["slurmVersion"] = 1; -$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%H'"); -$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%p'"); -$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%an <%ae>'"); -$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%aD'"); -$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%s'"); +$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%H'"); +$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%p'"); +$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%an <%ae>'"); +$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%aD'"); +$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%s'"); $roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; $roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"]; $roas["validationOutputFilters"]["prefixFilters"] = array(); diff --git a/roagen.php b/roagen.php index b1b5f30..acf1b55 100755 --- a/roagen.php +++ b/roagen.php @@ -4,11 +4,11 @@ require ("lib/define.php"); require ("lib/functions.php"); // Define array() we are going to populate with data. -$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%H'"); -$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%p'"); -$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%an <%ae>'"); -$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%aD'"); -$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --pretty='format:%s'"); +$roas["_comments"]["modified"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%H'"); +$roas["_comments"]["modified"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%p'"); +$roas["_comments"]["modified"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%an <%ae>'"); +$roas["_comments"]["modified"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%aD'"); +$roas["_comments"]["modified"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --merges --pretty='format:%s'"); $roas["_comments"]["modified"]["url"] = "https://git.dn42.us/dn42/registry/commit/"; $roas["_comments"]["modified"]["url"] .= $roas["_comments"]["modified"]["commit"]; diff --git a/update.sh b/update.sh index 4fc48d5..ad6a1f3 100755 --- a/update.sh +++ b/update.sh @@ -49,10 +49,10 @@ echo "## Notes ## [Last commit][0] at [dn42 registry][1] \`\`\` -$(git -C ../registry/ log -n 1) +$(git -C ../registry/ log -n 1 --merges) \`\`\` -[0]: https://git.dn42.us/dn42/registry/commit/$(git -C ../registry/ log -n 1 --pretty='format:%H') +[0]: https://git.dn42.us/dn42/registry/commit/$(git -C ../registry/ log -n 1 --merges --pretty='format:%H') [1]: https://git.dn42.us/dn42/registry " > roa/README.md