API tools faq
paste
grahamperrin

FreeBSD doc [main 4c74229a7c] committed but not pushed

grahamperrin
Jul 1st, 2022 (edited)
114
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 14.56 KB | None | 0 0
raw download clone embed print report
  1. % whoami ; pwd
  2. grahamperrin
  3. /usr/home/grahamperrin/dev/freebsd/doc
  4. % cd .. && rm -r doc
  5. override r--r--r-- grahamperrin/grahamperrin uarch for doc/.git/objects/44/8c83fe3234724fa80f755d5e53cd04fb3b8fc3? ^C
  6. % sudo rm -r /usr/home/grahamperrin/dev/freebsd/doc
  7. grahamperrin's password:
  8. % pwd
  9. /usr/home/grahamperrin/dev/freebsd
  10. % git -C /usr/home/grahamperrin/dev/freebsd clone ssh://git@gitrepo.FreeBSD.org/doc.git
  11. Cloning into 'doc'...
  12. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  13. remote: Enumerating objects: 485038, done.
  14. remote: Counting objects: 100% (35195/35195), done.
  15. remote: Compressing objects: 100% (11027/11027), done.
  16. remote: Total 485038 (delta 24020), reused 29246 (delta 20036), pack-reused 449843
  17. Receiving objects: 100% (485038/485038), 309.51 MiB | 5.33 MiB/s, done.
  18. Resolving deltas: 100% (332960/332960), done.
  19. Updating files: 100% (9825/9825), done.
  20. % git -C /usr/home/grahamperrin/dev/freebsd/doc remote -v
  21. origin ssh://git@gitrepo.FreeBSD.org/doc.git (fetch)
  22. origin ssh://git@gitrepo.FreeBSD.org/doc.git (push)
  23. % git -C /usr/doc remote -v
  24. freebsd https://git.freebsd.org/doc.git (fetch)
  25. freebsd ssh://git@gitrepo.freebsd.org/doc.git (push)
  26. origin https://github.com/grahamperrin/freebsd-doc.git (fetch)
  27. origin https://github.com/grahamperrin/freebsd-doc.git (push)
  28. upstream https://github.com/freebsd/freebsd-doc.git (fetch)
  29. upstream https://github.com/freebsd/freebsd-doc.git (push)
  30. % rm /tmp/doc-git-patchfile
  31. % git -C /usr/doc diff main patch-1 > /tmp/doc-git-patchfile
  32. % git -C /usr/home/grahamperrin/dev/freebsd/doc apply /tmp/doc-git-patchfile
  33. % git -C /usr/home/grahamperrin/dev/freebsd/doc diff
  34. diff --git a/documentation/content/en/articles/pgpkeys/_index.adoc b/documentation/content/en/articles/pgpkeys/_index.adoc
  35. index 4d93eb0f22..b7e5ced254 100644
  36. --- a/documentation/content/en/articles/pgpkeys/_index.adoc
  37. +++ b/documentation/content/en/articles/pgpkeys/_index.adoc
  38. @@ -1005,6 +1005,9 @@ include::{include-path}den.key[]
  39. === `{csjp}`
  40. include::{include-path}csjp.key[]
  41.  
  42. +=== `{grahamperrin}`
  43. +include::{include-path}grahamperrin.key[]
  44. +
  45. === `{gerald}`
  46. include::{include-path}gerald.key[]
  47.  
  48. diff --git a/shared/authors.adoc b/shared/authors.adoc
  49. index 1253ce0b43..79a35779ae 100644
  50. --- a/shared/authors.adoc
  51. +++ b/shared/authors.adoc
  52. @@ -1236,6 +1236,10 @@
  53. :gpalmer-email: gpalmer@FreeBSD.org
  54. :gpalmer: {gpalmer-name} <{gpalmer-email}>
  55.  
  56. +:grahamperrin-name: Graham Perrin
  57. +:grahamperrin-email: grahamperrin@FreeBSD.org
  58. +:grahamperrin: {grahamperrin-name} <{grahamperrin-email}>
  59. +
  60. :graichen-name: Thomas Graichen
  61. :graichen-email: graichen@FreeBSD.org
  62. :graichen: {graichen-name} <{graichen-email}>
  63. diff --git a/shared/contrib-committers.adoc b/shared/contrib-committers.adoc
  64. index 0a88224d59..448c83fe32 100644
  65. --- a/shared/contrib-committers.adoc
  66. +++ b/shared/contrib-committers.adoc
  67. @@ -263,6 +263,7 @@
  68. * {cperciva}
  69. * {alfred}
  70. * {csjp}
  71. +* {grahamperrin}
  72. * {gerald}
  73. * {scottph}
  74. * {0mp}
  75. diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml
  76. index 6a089600b2..55ff5abf34 100644
  77. --- a/website/data/en/news/news.toml
  78. +++ b/website/data/en/news/news.toml
  79. @@ -14,6 +14,10 @@ date= "2022-06-09"
  80. title = "January-March 2022 Status Report"
  81. 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."
  82.  
  83. +[[news]]
  84. +date= "2022-06-01"
  85. +description = "New committer: <a href=\"mailto:grahamperrin@FreeBSD.org\">Graham Perrin</a> (doc)"
  86. +
  87. [[news]]
  88. date = "2022-05-12"
  89. title = "FreeBSD 13.1-RELEASE Available"
  90. % git -C /usr/home/grahamperrin/dev/freebsd/doc add .
  91. % git -C /usr/home/grahamperrin/dev/freebsd/doc commit
  92. [main 4c74229a7c] New committer (doc): Graham Perrin, grahamperrin@
  93. 5 files changed, 104 insertions(+)
  94. create mode 100644 documentation/static/pgpkeys/grahamperrin.key
  95. % git -C /usr/home/grahamperrin/dev/freebsd/doc status
  96. On branch main
  97. Your branch is ahead of 'origin/main' by 1 commit.
  98. (use "git push" to publish your local commits)
  99.  
  100. nothing to commit, working tree clean
  101. % date
  102. Fri 1 Jul 2022 08:16:10 BST
  103. % git -C /usr/home/grahamperrin/dev/freebsd/doc push
  104. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  105. Enumerating objects: 36, done.
  106. Counting objects: 100% (36/36), done.
  107. Delta compression using up to 4 threads
  108. Compressing objects: 100% (17/17), done.
  109. Writing objects: 100% (19/19), 5.47 KiB | 2.74 MiB/s, done.
  110. Total 19 (delta 13), reused 0 (delta 0), pack-reused 0
  111. remote:
  112. remote: ================================================================
  113. remote: grahamperrin, you are pushing a commit which author and committer are different:
  114. remote:
  115. remote: author: Graham Perrin <⋯@gmail.com>
  116. remote: commit: 4c74229a7c304b5864424c471db37914179d6661
  117. remote: subject: New committer (doc): Graham Perrin, grahamperrin@
  118. remote:
  119. remote: Please check the author name and email are correct and then use:
  120. remote: git push --push-option=confirm-author
  121. remote: ================================================================
  122. To ssh://gitrepo.FreeBSD.org/doc.git
  123. ! [remote rejected] main -> main (pre-receive hook declined)
  124. error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/doc.git'
  125. % git -C /usr/home/grahamperrin/dev/freebsd/doc push --push-option=confirm-author
  126. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  127. Enumerating objects: 36, done.
  128. Counting objects: 100% (36/36), done.
  129. Delta compression using up to 4 threads
  130. Compressing objects: 100% (17/17), done.
  131. Writing objects: 100% (19/19), 5.47 KiB | 5.47 MiB/s, done.
  132. Total 19 (delta 13), reused 0 (delta 0), pack-reused 0
  133. remote:
  134. remote: ================================================================
  135. remote: grahamperrin, you can't push commit by Graham Perrin <grahaperrin@gmail.com>
  136. remote: 4c74229a7c304b5864424c471db37914179d6661 - New committer (doc): Graham Perrin, grahamperrin@
  137. remote:
  138. remote: Please check output of freefall:/usr/local/bin/gen-gitconfig.sh
  139. remote: ================================================================
  140. remote:
  141. remote: FATAL: VREF/COMMITTER-CHECK: helper program exit status 65280
  142. remote: error: hook declined to update refs/heads/main
  143. To ssh://gitrepo.FreeBSD.org/doc.git
  144. ! [remote rejected] main -> main (hook declined)
  145. error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/doc.git'
  146. % ssh grahamperrin@freefall.freebsd.org
  147. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  148. …
  149. grahamperrin@freefall:~ % echo $0
  150. -tcsh
  151. grahamperrin@freefall:~ % /usr/local/bin/gen-gitconfig.sh
  152. Use following commands in your newly cloned FreeBSD repository
  153. to ensure the committer name and email match FreeBSD.org data:
  154.  
  155. ----
  156. git config user.name "Graham Perrin"
  157. git config user.email grahamperrin@FreeBSD.org
  158. ---
  159.  
  160. Notes:
  161. - Your name needs to be exactly matched and the "FreeBSD.org"
  162. part in the email is case sensitive because we want your
  163. contribution history not to be counted separately, and
  164. work nicely with others' repository analyzers.
  165.  
  166. - You can use `git config --global` to set it globally in
  167. your ~/.gitconfig
  168. grahamperrin@freefall:~ % exit
  169. logout
  170. Connection to freefall.freebsd.org closed.
  171. % git -C /usr/home/grahamperrin/dev/freebsd/doc config user.name "Graham Perrin"
  172. % git -C /usr/home/grahamperrin/dev/freebsd/doc config user.email grahamperrin@FreeBSD.org
  173. % date
  174. Fri 1 Jul 2022 08:20:11 BST
  175. % git -C /usr/home/grahamperrin/dev/freebsd/doc push
  176. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  177. Enumerating objects: 36, done.
  178. Counting objects: 100% (36/36), done.
  179. Delta compression using up to 4 threads
  180. Compressing objects: 100% (17/17), done.
  181. Writing objects: 100% (19/19), 5.47 KiB | 2.74 MiB/s, done.
  182. Total 19 (delta 13), reused 0 (delta 0), pack-reused 0
  183. remote:
  184. remote: ================================================================
  185. remote: grahamperrin, you are pushing a commit which author and committer are different:
  186. remote:
  187. remote: author: Graham Perrin <⋯@gmail.com>
  188. remote: commit: 4c74229a7c304b5864424c471db37914179d6661
  189. remote: subject: New committer (doc): Graham Perrin, grahamperrin@
  190. remote:
  191. remote: Please check the author name and email are correct and then use:
  192. remote: git push --push-option=confirm-author
  193. remote: ================================================================
  194. To ssh://gitrepo.FreeBSD.org/doc.git
  195. ! [remote rejected] main -> main (pre-receive hook declined)
  196. error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/doc.git'
  197. % git -C /usr/home/grahamperrin/dev/freebsd/doc push --push-option=confirm-author
  198. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  199. Enumerating objects: 36, done.
  200. Counting objects: 100% (36/36), done.
  201. Delta compression using up to 4 threads
  202. Compressing objects: 100% (17/17), done.
  203. Writing objects: 100% (19/19), 5.47 KiB | 5.47 MiB/s, done.
  204. Total 19 (delta 13), reused 0 (delta 0), pack-reused 0
  205. remote:
  206. remote: ================================================================
  207. remote: grahamperrin, you can't push commit by Graham Perrin <grahaperrin@gmail.com>
  208. remote: 4c74229a7c304b5864424c471db37914179d6661 - New committer (doc): Graham Perrin, grahamperrin@
  209. remote:
  210. remote: Please check output of freefall:/usr/local/bin/gen-gitconfig.sh
  211. remote: ================================================================
  212. remote:
  213. remote: FATAL: VREF/COMMITTER-CHECK: helper program exit status 65280
  214. remote: error: hook declined to update refs/heads/main
  215. To ssh://gitrepo.FreeBSD.org/doc.git
  216. ! [remote rejected] main -> main (hook declined)
  217. error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/doc.git'
  218. % ssh grahamperrin@freefall.freebsd.org
  219. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  220. …
  221. grahamperrin@freefall:~ % /usr/local/bin/gen-gitconfig.sh
  222. Use following commands in your newly cloned FreeBSD repository
  223. to ensure the committer name and email match FreeBSD.org data:
  224.  
  225. ----
  226. git config user.name "Graham Perrin"
  227. git config user.email grahamperrin@FreeBSD.org
  228. ---
  229.  
  230. Notes:
  231. - Your name needs to be exactly matched and the "FreeBSD.org"
  232. part in the email is case sensitive because we want your
  233. contribution history not to be counted separately, and
  234. work nicely with others' repository analyzers.
  235.  
  236. - You can use `git config --global` to set it globally in
  237. your ~/.gitconfig
  238. grahamperrin@freefall:~ % exit
  239. logout
  240. Connection to freefall.freebsd.org closed.
  241. % git -C /usr/home/grahamperrin/dev/freebsd/doc config author.email grahamperrin@FreeBSD.org
  242. % date
  243. Fri 1 Jul 2022 08:25:13 BST
  244. % git -C /usr/home/grahamperrin/dev/freebsd/doc push
  245. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  246. Enumerating objects: 36, done.
  247. Counting objects: 100% (36/36), done.
  248. Delta compression using up to 4 threads
  249. Compressing objects: 100% (17/17), done.
  250. Writing objects: 100% (19/19), 5.47 KiB | 2.74 MiB/s, done.
  251. Total 19 (delta 13), reused 0 (delta 0), pack-reused 0
  252. remote:
  253. remote: ================================================================
  254. remote: grahamperrin, you are pushing a commit which author and committer are different:
  255. remote:
  256. remote: author: Graham Perrin <⋯@gmail.com>
  257. remote: commit: 4c74229a7c304b5864424c471db37914179d6661
  258. remote: subject: New committer (doc): Graham Perrin, grahamperrin@
  259. remote:
  260. remote: Please check the author name and email are correct and then use:
  261. remote: git push --push-option=confirm-author
  262. remote: ================================================================
  263. To ssh://gitrepo.FreeBSD.org/doc.git
  264. ! [remote rejected] main -> main (pre-receive hook declined)
  265. error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/doc.git'
  266. % man git-config
  267. % git -C /usr/home/grahamperrin/dev/freebsd/doc config author.email Graham Perrin
  268. % date
  269. Fri 1 Jul 2022 08:27:50 BST
  270. % git -C /usr/home/grahamperrin/dev/freebsd/doc push
  271. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  272. Enumerating objects: 36, done.
  273. Counting objects: 100% (36/36), done.
  274. Delta compression using up to 4 threads
  275. Compressing objects: 100% (17/17), done.
  276. Writing objects: 100% (19/19), 5.47 KiB | 5.47 MiB/s, done.
  277. Total 19 (delta 13), reused 0 (delta 0), pack-reused 0
  278. remote:
  279. remote: ================================================================
  280. remote: grahamperrin, you are pushing a commit which author and committer are different:
  281. remote:
  282. remote: author: Graham Perrin <⋯@gmail.com>
  283. remote: commit: 4c74229a7c304b5864424c471db37914179d6661
  284. remote: subject: New committer (doc): Graham Perrin, grahamperrin@
  285. remote:
  286. remote: Please check the author name and email are correct and then use:
  287. remote: git push --push-option=confirm-author
  288. remote: ================================================================
  289. To ssh://gitrepo.FreeBSD.org/doc.git
  290. ! [remote rejected] main -> main (pre-receive hook declined)
  291. error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/doc.git'
  292. % git -C /usr/home/grahamperrin/dev/freebsd/doc config author Graham Perrin <grahamperrin@FreeBSD.org>
  293. Missing name for redirect.
  294. % git -C /usr/home/grahamperrin/dev/freebsd/doc config author "Graham Perrin <grahamperrin@FreeBSD.org>"
  295. error: key does not contain a section: author
  296. % git -C /usr/home/grahamperrin/dev/freebsd/doc config --global author.email "grahamperrin@FreeBSD.org"
  297. % date
  298. Fri 1 Jul 2022 08:43:36 BST
  299. % git -C /usr/home/grahamperrin/dev/freebsd/doc push
  300. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  301. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  302. Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa':
  303. Enumerating objects: 36, done.
  304. Counting objects: 100% (36/36), done.
  305. Delta compression using up to 4 threads
  306. Compressing objects: 100% (17/17), done.
  307. Writing objects: 100% (19/19), 5.47 KiB | 5.47 MiB/s, done.
  308. Total 19 (delta 13), reused 0 (delta 0), pack-reused 0
  309. remote:
  310. remote: ================================================================
  311. remote: grahamperrin, you are pushing a commit which author and committer are different:
  312. remote:
  313. remote: author: Graham Perrin <grahaperrin@gmail.com>
  314. remote: commit: 4c74229a7c304b5864424c471db37914179d6661
  315. remote: subject: New committer (doc): Graham Perrin, grahamperrin@
  316. remote:
  317. remote: Please check the author name and email are correct and then use:
  318. remote: git push --push-option=confirm-author
  319. remote: ================================================================
  320. To ssh://gitrepo.FreeBSD.org/doc.git
  321. ! [remote rejected] main -> main (pre-receive hook declined)
  322. error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/doc.git'
  323. %
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!