API tools faq
paste
grahamperrin

FreeBSD doc [main cf55804237] committed but not pushed

grahamperrin
Jun 30th, 2022 (edited)
415
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.53 KB | None | 0 0
raw download clone embed print report
  1. % git -C /usr/doc diff main patch-1 > /tmp/doc-git-patchfile
  2. % git -C /usr/home/grahamperrin/dev/freebsd/doc apply /tmp/doc-git-patchfile
  3. error: patch failed: documentation/content/en/articles/pgpkeys/_index.adoc:1005
  4. error: documentation/content/en/articles/pgpkeys/_index.adoc: patch does not apply
  5. % whoami
  6. grahamperrin
  7. % cd ~/dev/freebsd/doc
  8. % git pull
  9. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  10. Already up to date.
  11. % git stash
  12. Saved working directory and index state WIP on main: 14e46a2982 [hb][jails] Fix jail configuration example
  13. % git stash clear
  14. % git -C /usr/home/grahamperrin/dev/freebsd/doc apply /tmp/doc-git-patchfile
  15. % git -C /usr/home/grahamperrin/dev/freebsd/doc diff
  16. diff --git a/documentation/content/en/articles/pgpkeys/_index.adoc b/documentation/content/en/articles/pgpkeys/_index.adoc
  17. index 4d93eb0f22..b7e5ced254 100644
  18. --- a/documentation/content/en/articles/pgpkeys/_index.adoc
  19. +++ b/documentation/content/en/articles/pgpkeys/_index.adoc
  20. @@ -1005,6 +1005,9 @@ include::{include-path}den.key[]
  21.  === `{csjp}`
  22.  include::{include-path}csjp.key[]
  23.  
  24. +=== `{grahamperrin}`
  25. +include::{include-path}grahamperrin.key[]
  26. +
  27.  === `{gerald}`
  28.  include::{include-path}gerald.key[]
  29.  
  30. diff --git a/shared/authors.adoc b/shared/authors.adoc
  31. index 1253ce0b43..79a35779ae 100644
  32. --- a/shared/authors.adoc
  33. +++ b/shared/authors.adoc
  34. @@ -1236,6 +1236,10 @@
  35.  :gpalmer-email: gpalmer@FreeBSD.org
  36.  :gpalmer: {gpalmer-name} <{gpalmer-email}>
  37.  
  38. +:grahamperrin-name: Graham Perrin
  39. +:grahamperrin-email: grahamperrin@FreeBSD.org
  40. +:grahamperrin: {grahamperrin-name} <{grahamperrin-email}>
  41. +
  42.  :graichen-name: Thomas Graichen
  43.  :graichen-email: graichen@FreeBSD.org
  44.  :graichen: {graichen-name} <{graichen-email}>
  45. diff --git a/shared/contrib-committers.adoc b/shared/contrib-committers.adoc
  46. index 0a88224d59..448c83fe32 100644
  47. --- a/shared/contrib-committers.adoc
  48. +++ b/shared/contrib-committers.adoc
  49. @@ -263,6 +263,7 @@
  50.  * {cperciva}
  51.  * {alfred}
  52.  * {csjp}
  53. +* {grahamperrin}
  54.  * {gerald}
  55.  * {scottph}
  56.  * {0mp}
  57. diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml
  58. index 6a089600b2..55ff5abf34 100644
  59. --- a/website/data/en/news/news.toml
  60. +++ b/website/data/en/news/news.toml
  61. @@ -14,6 +14,10 @@ date= "2022-06-09"
  62.  title = "January-March 2022 Status Report"
  63.  description = "The <a href=\"https://www.freebsd.org/status/report-2022-01-2022-03/\">January to March 2022 Status Report</a> is now available with 22 entries."
  64.  
  65. +[[news]]
  66. +date= "2022-06-01"
  67. +description = "New committer: <a href=\"mailto:grahamperrin@FreeBSD.org\">Graham Perrin</a> (doc)"
  68. +
  69.  [[news]]
  70.  date = "2022-05-12"
  71.  title = "FreeBSD 13.1-RELEASE Available"
  72. % git -C /usr/home/grahamperrin/dev/freebsd/doc add
  73. Nothing specified, nothing added.
  74. hint: Maybe you wanted to say 'git add .'?
  75. hint: Turn this message off by running
  76. hint: "git config advice.addEmptyPathspec false"
  77. % git -C /usr/home/grahamperrin/dev/freebsd/doc add .
  78. % git -C /usr/home/grahamperrin/dev/freebsd/doc diff
  79. % git -C /usr/home/grahamperrin/dev/freebsd/doc commit
  80. [main cf55804237] New committer (doc): Graham Perrin, grahamperrin@
  81.  5 files changed, 104 insertions(+)
  82.  create mode 100644 documentation/static/pgpkeys/grahamperrin.key
  83. % date ; history 13
  84. Fri  1 Jul 2022 07:28:29 BST
  85.   2066  4:12    git -C /usr/home/grahamperrin/dev/freebsd/doc apply /tmp/doc-git-patchfile
  86.   2067  4:13    whoami
  87.   2068  4:13    cd ~/dev/freebsd/doc
  88.   2069  4:13    git pull
  89.   2070  4:13    git stash
  90.   2071  4:13    git stash clear
  91.   2072  4:13    git -C /usr/home/grahamperrin/dev/freebsd/doc apply /tmp/doc-git-patchfile
  92.   2073  4:14    git -C /usr/home/grahamperrin/dev/freebsd/doc diff
  93.   2074  4:21    git -C /usr/home/grahamperrin/dev/freebsd/doc add
  94.   2075  4:21    git -C /usr/home/grahamperrin/dev/freebsd/doc add .
  95.   2076  4:21    git -C /usr/home/grahamperrin/dev/freebsd/doc diff
  96.   2077  4:26    git -C /usr/home/grahamperrin/dev/freebsd/doc commit
  97.   2078  7:28    date ; history 13
  98. % git -C /usr/home/grahamperrin/dev/freebsd/doc remote -v
  99. origin  ssh://git@gitrepo.FreeBSD.org/doc.git (fetch)
  100. origin  ssh://git@gitrepo.FreeBSD.org/doc.git (push)
  101. % man git-add
  102. % man git-status
  103. % git -C /usr/home/grahamperrin/dev/freebsd/doc remote -v
  104. origin  ssh://git@gitrepo.FreeBSD.org/doc.git (fetch)
  105. origin  ssh://git@gitrepo.FreeBSD.org/doc.git (push)
  106. % git -C /usr/home/grahamperrin/dev/freebsd/doc status
  107. On branch main
  108. Your branch is ahead of 'origin/main' by 1 commit.
  109.   (use "git push" to publish your local commits)
  110.  
  111. nothing to commit, working tree clean
  112. %
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!