-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathisysd_contribution_1.patch
3675 lines (3597 loc) · 147 KB
/
isysd_contribution_1.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
#MIT License
#
#Copyright (c) 2016 GitGuild developers
#
#Permission is hereby granted, free of charge, to any person obtaining a copy
#of this software and associated documentation files (the "Software"), to deal
#in the Software without restriction, including without limitation the rights
#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
#copies of the Software, and to permit persons to whom the Software is
#furnished to do so, subject to the following conditions:
#
#The above copyright notice and this permission notice shall be included in all
#copies or substantial portions of the Software.
#
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
#SOFTWARE.
#
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//CHANGELOG.md /new//CHANGELOG.md
*** /old//CHANGELOG.md 2017-01-01 11:35:02.788178706 -0500
--- /new//CHANGELOG.md 2017-01-01 11:30:27.252182375 -0500
***************
*** 5,7 ****
--- 5,16 ----
This Change Log format is suggested by
<https://github.com/olivierlacan/keep-a-changelog/blob/master/CHANGELOG.md>
+
+ <a name="0.2.9"></a>
+ ## 0.2.9 (2017-01-01)
+
+ #### Added
+
+ * Install and configure gitguild
+ * Ledger for this guild
+ * isysd becomes member
\ No newline at end of file
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//conf/gitolite.conf /new//conf/gitolite.conf
*** /old//conf/gitolite.conf 2017-01-01 11:35:02.788178706 -0500
--- /new//conf/gitolite.conf 2017-01-01 11:30:27.252182375 -0500
***************
*** 1,6 ****
@admins = isysd
repo gitguild
- RW = @admins
RW isysd = isysd
- R = @all
--- 1,8 ----
@admins = isysd
+ repo @all
+ RW refs/.* = @admins
+ R = @all
+
repo gitguild
RW isysd = isysd
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//CONTRIBUTING.md /new//CONTRIBUTING.md
*** /old//CONTRIBUTING.md 2017-01-01 11:35:02.788178706 -0500
--- /new//CONTRIBUTING.md 2017-01-01 11:30:27.252182375 -0500
***************
*** 2,14 ****
Feedback and contributions are very welcome!
! ## General information
! ### Open Source License (MIT)
! All (new) contributed material must be released under the [MIT license](./LICENSE).
! All new contributed material that is not executable, including all text when not executed, is also released under the [Creative Commons Attribution 3.0 International (CC BY 3.0) license](https://creativecommons.org/licenses/by/3.0/) or later.
## Vulnerability reporting (security issues)
--- 2,37 ----
Feedback and contributions are very welcome!
! ## A GitGuild Project
+ This project uses [GitGuild](https://github.com/GitGuild/gitguild) software to govern itself and all contributions. Please [install](https://github.com/GitGuild/gitguild#install) the client to ensure you meet the strict configuration and usage requirements. These include, but are not limited to the following.
! | Rule | Description |
! |-------|----------------|
! | Must sign | Every commit must be GPG signed by a member listed in the AUTHORS file. |
! | Consensus branches | The `master` and `gitguild` branches are reserved for consensus. Only commits approved by XP vote can be merged. |
! | Member branches | A member's branch is their vote on the state and contents of the chain. |
! | Higher | Every commit must have a higher `<guild_name>:Height` than it's parent. |
! | Highest | Consensus is the highest valid branch of a guild. This should be mirrored to master and the guild's own branch as commits are made to member branches. |
! | Max Depth | Each member can only vote up to their total `<user_name>:Height` on each parent hash. |
! The first three rules are all git best practices. These rules, and the automation of execution of checks on them, ensure a complete chain of responsibility for each change. Incomplete usage of gpg signing is not nearly good enough, as Mike Gerwitz points out in [A Git Horror Story: Repository Integrity With Signed Commits](https://mikegerwitz.com/papers/git-horror-story.html).
!
! "[H]ow can you be sure that their commits are actually their own? Furthermore, how can you be sure that any commits they approve (or sign off on using git commit -s) were actually approved by them?
!
! That is, of course, assuming that they have no ill intent. For example, what of the pissed off employee looking to get the arrogant, obnoxious co-worker fired by committing under the coworker’s name/email? What if you were the manager or project lead? Whose word would you take? How would you even know whom to suspect?"
!
! The answer to these questions is strict standards and enforcement, i.e. rules 1-3.
!
! The last three rules are all for [ledger](https://ledger-cli.org) use, and ensure consensus is calculated and enforced. Git actions are recorded by spending XP in the ledger in `Height` and `Depth` accounts. The amount of XP in the `Height` of any commit determines it's acceptance or rejection by the organization, and therefore it's mergability into master.
!
! ## Payment
!
! Contributors can request payment in GitGuild coin (XGG) as part of the contribution, and are allowed to redeem this XGG for BTC, DASH or other assets. If the commit is approved by the other members, the XGG will be counted as Income, also triggering a corresponding XP increase for the contributor.
!
! Like every change made to a guild, this payment request process is templated in a patch file, and should be run using `gitguild tx build`. In this case the tx name is `paid_contribution`.
!
! Though there are no set limits or rules on how much you can ask to be paid, remember that the pay is subject to review and approval by your peers. It is the very people reviewing your code that ultimately decide any pay you receive.
## Vulnerability reporting (security issues)
***************
*** 16,71 ****
please send an email to the security contacts that you have such
information, and we'll tell you the next steps.
For now, the security contacts are:
! isysd <ira@gitguild.com>,
! cindy-zimmerman <cindy@tigoctm.com>,
! and d3brouille <robinson@gitguild.com>
! (remove the -NOSPAM markers).
Please use the PGP keys provided in the AUTHORS file to encrypt your message!
! ## Documentation changes
!
! Most of the documentation is in "markdown" format.
! All markdown files use the .md filename extension.
!
! Where reasonable, limit yourself to Markdown
! that will be accepted by different markdown processors
! (e.g., what is specified by CommonMark or the original Markdown)
! In practice we use
! the version of Markdown implemented by GitHub when it renders .md files,
! and you can use its extensions
! (in particular, mark code snippets with the programming language used).
! This version of markdown is sometimes called
! [GitHub-flavored markdown](https://help.github.com/articles/github-flavored-markdown/).
! In particular, blank lines separate paragraphs; newlines inside a paragraph
! do *not* force a line break.
! Beware - this is *not*
! the same markdown algorithm used by GitHub when it renders
! issue or pull comments; in those cases
! [newlines in paragraph-like content are considered as real line breaks](https://help.github.com/articles/writing-on-github/);
! unfortunately this other algorithm is *also* called
! GitHub rendered markdown.
! (Yes, it'd be better if there were standard different names
! for different things.)
!
! The style is basically that enforced by the "markdownlint" tool.
! Don't use tab characters, avoid "bare" URLs (in a hypertext link, the
! link text and URL should be on the same line), and try to limit
! lines to 80 characters (but ignore the 80-character limit if that would
! create bare URLs).
! Using the "rake markdownlint" or "rake" command
! (described below) implemented in the development
! environment can detect some problems in the markdown.
! That said, if you don't know how to install the development environment,
! don't worry - we'd rather have your proposals, even if you don't know how to
! check them that way.
!
! Do not use trailing two spaces for line breaks, since these cannot be
! seen and may be silently removed by some tools.
! Instead, use <tt><br /></tt> (an HTML break).
! ## Code changes
! ##### Copyright
! This file adapted from the Linux Foundation's Core Infrastructure Initiative's [CONTRIBUTING.md](https://github.com/linuxfoundation/cii-best-practices-badge/blob/master/CONTRIBUTING.md).
--- 39,54 ----
please send an email to the security contacts that you have such
information, and we'll tell you the next steps.
For now, the security contacts are:
! isysd <ira@gitguild.com>, and
! cindy-zimmerman <cindy@tigoctm.com>.
Please use the PGP keys provided in the AUTHORS file to encrypt your message!
! ### Copyright
! This file adapted from the Linux Foundation's Core Infrastructure Initiative's [CONTRIBUTING.md](https://github.com/linuxfoundation/cii-best-practices-badge/blob/master/CONTRIBUTING.md).
! ##### Open Source License (MIT)
! All (new) contributed material must be released under the [MIT license](./LICENSE).
! All new contributed material that is not executable, including all text when not executed, is also released under the [Creative Commons Attribution 3.0 International (CC BY 3.0) license](https://creativecommons.org/licenses/by/3.0/) or later.
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//CREDITS /new//CREDITS
*** /old//CREDITS 2017-01-01 11:35:02.788178706 -0500
--- /new//CREDITS 1969-12-31 19:00:00.000000000 -0500
***************
*** 1,43 ****
- # Credits
-
- The maintainers, contributors, and members of this guild would like to thank the following for essential prior contributions.
-
- Without these foundation blocks, our chain would not be able to grow tall and thick.
-
- ### GNU
-
- So basic, even git wouldn't work without it, the GNU toolkit is used extensively by gitguild.
- Additionally, the GNU standards were inspirational for a number of example documents and formats.
-
- ### Linux Foundation's Core Infrastructure Initiative
-
- The greatest source of standards and example documents is definitely the CII. This includes but is not limited to the CHANGELOG, CONTRIBUTING, CREDITS, and AUTHORS file formats.
-
- ### git
-
- If there is one core foundation to the gitguild stack, it has to be git.
- Git is the water that guilds swim in. Thank you git for the open ocean, full of diverse ecosystems.
-
- ### GnuPG
-
- There is a saying "don't roll your own crypto." Thanks to GnuPG, we have an almost universally respected, flexible crypto backbone.
- Thank you GnuPG for doing the heavy lifting, and carrying the weight to git, email, and so many other areas.
-
- ### Ledger-cli
-
- How do you herd cats? Count them very carefully. Twice. Thanks to ledger-cli, the perfect plaintext accounting system was ready and waiting to drop into a git repo for version control.
-
- ### gitolite
-
- Gitolite was a late find but natural fit for gitguild development. Comprehensive permissions inside a git repo, including ssh keyring... it is just begging to be decentralized.
- We're honored to try extending gitolite into a P2P network.
-
- ### Individual People
-
- + Ira Miller aka isysd
- + Cindy Zimmerman
- + Andre Haynes
- + d3brouille
- + et4te
- + welshjf
-
--- 0 ----
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//CREDITS.md /new//CREDITS.md
*** /old//CREDITS.md 1969-12-31 19:00:00.000000000 -0500
--- /new//CREDITS.md 2017-01-01 11:30:27.252182375 -0500
***************
*** 0 ****
--- 1,43 ----
+ # Credits
+
+ The maintainers, contributors, and members of this guild would like to thank the following for essential prior contributions.
+
+ Without these foundation blocks, our chain would not be able to grow tall and thick.
+
+ ### GNU
+
+ So basic, even git wouldn't work without it, the GNU toolkit is used extensively by gitguild.
+ Additionally, the GNU standards were inspirational for a number of example documents and formats.
+
+ ### Linux Foundation's Core Infrastructure Initiative
+
+ The greatest source of standards and example documents is definitely the CII. This includes but is not limited to the CHANGELOG, CONTRIBUTING, CREDITS, and AUTHORS file formats.
+
+ ### git
+
+ If there is one core foundation to the gitguild stack, it has to be git.
+ Git is the water that guilds swim in. Thank you git for the open ocean, full of diverse ecosystems.
+
+ ### GnuPG
+
+ There is a saying "don't roll your own crypto." Thanks to GnuPG, we have an almost universally respected, flexible crypto backbone.
+ Thank you GnuPG for doing the heavy lifting, and carrying the weight to git, email, and so many other areas.
+
+ ### Ledger-cli
+
+ How do you herd cats? Count them very carefully. Twice. Thanks to ledger-cli, the perfect plaintext accounting system was ready and waiting to drop into a git repo for version control.
+
+ ### gitolite
+
+ Gitolite was a late find but natural fit for gitguild development. Comprehensive permissions inside a git repo, including ssh keyring... it is just begging to be decentralized.
+ We're honored to try extending gitolite into a P2P network.
+
+ ### Individual People
+
+ + Ira Miller aka isysd
+ + Cindy Zimmerman
+ + Andre Haynes
+ + d3brouille
+ + et4te
+ + welshjf
+
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//doc/consensus.md /new//doc/consensus.md
*** /old//doc/consensus.md 1969-12-31 19:00:00.000000000 -0500
--- /new//doc/consensus.md 2017-01-01 11:30:27.252182375 -0500
***************
*** 0 ****
--- 1,31 ----
+ # Consensus
+
+ ## Abstract
+
+ Git is a flexible version control system in use by tens of millions of collaborators worldwide. Git [stores data](https://git-scm.com/book/en/v2/Git-Internals-Git-Objects) in sha1 hash trees, and [supports](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) gpg signing of commits (since v1.7.9). With strict usage guidelines, these cryptographic utilities create a blockchain made up of gpg-signed, sha1-hashed commits.
+
+ ## Proof of Labor
+
+ A chain of signed commits is hearafter referred to as Proof of Labor. Proof of Labor is a flexible, meritocratic mining system.
+
+ Each block of data is made up of a pgp-signed git commit. This commit consistitutes some Labor performed by one or more members of the guild. The other members of the guild then vote on accepting the PR or not by merging the commit or creating a fork.
+
+ Once a commit has been merged into the master branch, it may not be reverted or overwritten without being detected by other members of the guild. Git guild are immutable unless a fork aka rebase is explicitely voted for. This is similar to other blockchains, where immutability is subject to maintaining consensus.
+
+ #### Crypto
+
+ While this system has not yet been reviewed by cryptographers, it should not be controversial. Proof of Labor uses standard, well established tools in a downright orthodox way.
+
+ GNU Privacy Guard aka GPG is a popular encryption program first released in 1999. GPG is open source software package compliant with [RFC 4880](https://tools.ietf.org/html/rfc4880), which is the IETF standards track specification of OpenPGP. The latest version (2.0.30) supports RSA, ElGamal and DSA signing, as well as a number of ciphers, hashes, and compression algorithms. It is commonly used for encrypting and/or signing emails, and is growing in use in the git community.
+
+ Git was developed as a file system, by Linus Torvalds, in 2005. The SHA1 hash tree that git uses was introduced in that first version. Since git has become one of the most popular software projects of all time, this hash tree has seen a lot of real world use, as well as development. Key to the hash tree is that all files are hashed into a commit, along with the parent commit(s). Git's hash tree is a directed acyclic graph. This means it is a one directional, immutable tree with branches and branch resolution. Loops, rewriting history, and a number of other logical inconsistencies are prevented.
+
+ Since git v1.7.9, released in 2012, git has supported GPG signing commits. This release was the final technical pre-requisite for Proof of Labor.
+
+ ## Summary
+
+ If this seems too easy, you're not alone. For software developers, git feels like water to a fish. It is challenging to discover something new about the environment you survive in.
+
+ The contributors to Proof of Labor are amazed at how broad the applications seem to be. The natural contracting language and strong reputation system of PoL are unique in a blockchain. Due to this broad scope, we have erred on the side of abstraction over specification. While Proof of Labor could be even more loose, and many alternate implementations are possible, we believe this is a flexible, minimal working ruleset.
+
+ Proof of Labor is complimentary with PoW systems in many ways, and could even be applied after the fact as a governance layer to blockchains like Bitcoin. It could be used as an oracle by other blockchains, or lend them sidechain functionality. It is not likely to be as fast or as directly scalable, but perhaps with advanced sidechain usage, even massive parallel processing could be possible. Most likely, however, an optimal hybrid will emerge after much experimentation.
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//doc/templates.md /new//doc/templates.md
*** /old//doc/templates.md 2017-01-01 11:35:02.796178706 -0500
--- /new//doc/templates.md 2017-01-01 11:30:27.252182375 -0500
***************
*** 22,28 ****
### Parameters
! To transform a strict patch into a more flexible template, add parameters. Gitguild template parameters are surrounded by triple tri-angle brackets. i.e. `<<< param_name >>>`. As far as the developers can tell, this is a previously unused format, which will avoid collisions with any documents under revision control.
At runtime, these parameters will be replaced by the appropriate values from the context of the transaction. For instance, `<<< user_name >>>` would be the current user's name when creating a transaction using a patch, but would be the committer's name when checking said transaction.
--- 22,28 ----
### Parameters
! To transform a strict patch into a more flexible template, add parameters. Gitguild template parameters are surrounded by triple angle brackets. i.e. `<<< param_name >>>`. As far as the developers can tell, this is a previously unused format, which will avoid collisions with any documents under revision control.
At runtime, these parameters will be replaced by the appropriate values from the context of the transaction. For instance, `<<< user_name >>>` would be the current user's name when creating a transaction using a patch, but would be the committer's name when checking said transaction.
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//doc/whitepaper.md /new//doc/whitepaper.md
*** /old//doc/whitepaper.md 2017-01-01 11:35:02.800178706 -0500
--- /new//doc/whitepaper.md 1969-12-31 19:00:00.000000000 -0500
***************
*** 1,84 ****
- # Git Guild Blockchain
-
- *A git guild is a git-native contract and payment network.*
-
- __Document version 0.2.0__
-
- ## Abstract
-
- Git is a flexible version control system in use by tens of millions of collaborators worldwide. Git [stores data](https://git-scm.com/book/en/v2/Git-Internals-Git-Objects) in sha1 hash trees, and [supports](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) gpg signing of commits (since v1.7.9). With strict usage guidelines, these cryptographic utilities create a blockchain made up of gpg-signed, sha1-hashed commits.
-
- ## Proof of Labor
-
- A chain of signed commits is hearafter referred to as Proof of Labor. Proof of Labor is a flexible, meritocratic mining system.
-
- Each block of data is made up of a pgp-signed git commit. This commit consistitutes some Labor performed by one or more members of the guild. The other members of the guild then vote on accepting the PR or not by merging the commit or creating a fork.
-
- Once a commit has been merged into the master branch, it may not be reverted or overwritten without being detected by other members of the guild. Git guild are immutable unless a fork aka rebase is explicitely voted for. This is similar to other blockchains, where immutability is subject to maintaining consensus.
-
- #### Crypto
-
- While this system has not yet been reviewed by cryptographers, it should not be controversial. Proof of Labor uses standard, well established tools in a downright orthodox way.
-
- GNU Privacy Guard aka GPG is a popular encryption program first released in 1999. GPG is open source software package compliant with [RFC 4880](https://tools.ietf.org/html/rfc4880), which is the IETF standards track specification of OpenPGP. The latest version (2.0.30) supports RSA, ElGamal and DSA signing, as well as a number of ciphers, hashes, and compression algorithms. It is commonly used for encrypting and/or signing emails, and is growing in use in the git community.
-
- Git was developed as a file system, by Linus Torvalds, in 2005. The SHA1 hash tree that git uses was introduced in that first version. Since git has become one of the most popular software projects of all time, this hash tree has seen a lot of real world use, as well as development. Key to the hash tree is that all files are hashed into a commit, along with the parent commit(s). Git's hash tree is a directed acyclic graph. This means it is a one directional, immutable tree with branches and branch resolution. Loops, rewriting history, and a number of other logical inconsistencies are prevented.
-
- Since git v1.7.9, released in 2012, git has supported GPG signing commits. This release was the final technical pre-requisite for Proof of Labor.
-
- ## Rules & Requirements
-
- The following rules of git and other software usage are necessary for the Proof of Labor model to function.
-
- | Rule | Description |
- |-------|----------------|
- | Must sign | Every commit must be signed by a signature of a member to be considered for merge. |
- | Member branches | A member's branch is their vote on the state and contents of the chain. Only the member is allowed to sign their own branch. |
- | Must merge votes | Any new master block must include every passing vote. Basically, master branch is consensus of valid votes. |
- | Auto-merge conflict resolution | Votes that are non-conflicting but behind the master branch must be merged. |
- | Higher | Every commit must have a higher `<guild_name>:Height` than it's parent. |
- | Highest | Consensus is the highest valid branch of a guild. This should be mirrored to master and the guild's own branch as commits are made to member branches. |
- | Max Depth | Each member can only vote up to their total `<user_name>:Height` on each parent hash. |
-
- The first four rules are all git best practices. These rules, and the automation of execution of checks on them, ensure a complete chain of responsibility for each change. Incomplete usage of gpg signing is not nearly good enough, as Mike Gerwitz points out in [A Git Horror Story: Repository Integrity With Signed Commits](https://mikegerwitz.com/papers/git-horror-story.html).
-
- "[H]ow can you be sure that their commits are actually their own? Furthermore, how can you be sure that any commits they approve (or sign off on using git commit -s) were actually approved by them?
-
- That is, of course, assuming that they have no ill intent. For example, what of the pissed off employee looking to get the arrogant, obnoxious co-worker fired by committing under the coworker’s name/email? What if you were the manager or project lead? Whose word would you take? How would you even know whom to suspect?"
-
- The answer to these questions is strict standards and enforcement, i.e. rules 1-4.
-
- The last three rules are all for ledger use, and ensure consensus is calculated and enforced. Git actions are recorded by spending XP in the ledger in `Height` and `Depth` accounts. The amount of XP in the `Height` of any commit determines it's acceptance or rejection by the organization, and therefore it's mergability into master.
-
- #### Branches
-
- Proof of Labor uses git branches for its data structure, and so needs strict control of these. The following keywords are reserved branch names.
-
- | Branch | Maintainer | Description |
- |--------------------|--------------------|------------------------|
- | master | Last to commit | The master branch is a protected communal branch. It reflects the latest valid state of the sum of all member branches. |
- | username | username | Each member must maintain their own branch, and use this branch for submitting votes (commits) or voting on the commits of others (merging). |
-
- Currently a trusted git server is used as the source of truth. The master branch must always be kept in a signed and complete state. Git's hash tree is also independently maintained by each member, serving as a complete, independent record of events. There are many ways this basic hosting setup can be enhanced, such as inserting the master commit hashes into a proof of work blockchain.
-
- #### Members
-
- Members apply to a guild by creating branch named after themselves, adding themselves to `AUTHORS`, adding their accounts and checks to the ledger files, adding a file with their ssh public key to the `keydir` directory, and committing the gpg-signed result. The existing members then vote, and, if the XP approval threshold is reached, the new user branch is merged, accepting the member into the guild.
-
- Because usernames are used throughout the guild data structures, a number of names are forbidden. As of now, usernames may only contain letters, numbers, `-`, and `_`. Note that usernames are not case-sensitive. The following keyword(s) are also reserved as forbidden usernames.
-
- | Name | Reason Forbidden |
- |--------------------|------------------------|
- | master | Keyword for the consensus branch. |
-
- ## Summary
-
- If this seems too easy, you're not alone. For software developers, git feels like water to a fish. It is challenging to discover something new about the environment you survive in.
-
- The contributors to Proof of Labor are amazed at how broad the applications seem to be. The natural contracting language and strong reputation system of PoL are unique in a blockchain. Due to this broad scope, we have erred on the side of abstraction over specification. While Proof of Labor could be even more loose, and many alternate implementations are possible, we believe this is a flexible, minimal working ruleset.
-
- Proof of Labor is complimentary with PoW systems in many ways, and could even be applied after the fact as a governance layer to blockchains like Bitcoin. It could be used as an oracle by other blockchains, or lend them sidechain functionality. It is not likely to be as fast or as directly scalable, but perhaps with advanced sidechain usage, even massive parallel processing could be possible. Most likely, however, an optimal hybrid will emerge after much experimentation.
-
- #### Living Document
-
- Don't take our word for it. This paper is governed by [a guild](https://github.com/GitGuild/GitGuild/tree/master). Try the bundled alpha client to demo and register with the founding guild.
--- 0 ----
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//gitguild /new//gitguild
*** /old//gitguild 2017-01-01 11:35:02.800178706 -0500
--- /new//gitguild 2017-01-01 11:34:36.184179061 -0500
***************
*** 270,277 ****
shift
tname="$1"
shift
! if [ "$2" != "" ] && [ "$(echo "$2" | grep .patch$ )" = "" ]; then
! phash="$2"
shift
build_tpl "$tname" "$phash" "$@"
else
--- 270,277 ----
shift
tname="$1"
shift
! if [ "$1" != "" ] && [ "$(echo "$1" | grep .patch$ )" = "" ]; then
! phash="$1"
shift
build_tpl "$tname" "$phash" "$@"
else
***************
*** 683,689 ****
# $1 is a parameter
# $2 is a value for $1
build_param_replace_command() {
! echo " | sed 's/<<< $1 >>>/$2/g'"
}
# $1 is a param to guess
--- 683,690 ----
# $1 is a parameter
# $2 is a value for $1
build_param_replace_command() {
! esc_str=$(echo "$2" | sed "s/\,/\\\\,/g")
! echo " | sed 's,<<< $1 >>>,$esc_str,g'"
}
# $1 is a param to guess
***************
*** 713,721 ****
;;
user_height)
if [ "$2" = "" ] || [ "$2" = "HEAD" ]; then
! ledger -f ledger/chain.ledger bal "$USER_NAME":Height | head -n 1 | grep -o "[^ ][0-9.]* XP" | tr -d " XP"
else
! ledger -f ledger/equity.parent bal "$USER_NAME":Height | head -n 1 | grep -o "[^ ][0-9.]* XP" | tr -d " XP"
fi
;;
date)
--- 714,723 ----
;;
user_height)
if [ "$2" = "" ] || [ "$2" = "HEAD" ]; then
! ledger -f ledger/equity.parent bal "$USER_NAME":Height | head -n 1 | grep -o "[^ ][0-9.,]* XP" | tr -d " XP"
else
! OTHER_USER=$(git log -n 1 "$2".. --pretty="%cn")
! ledger -f ledger/equity.parent bal "$OTHER_USER":Height | head -n 1 | grep -o "[^ ][0-9.,]* XP" | tr -d " XP"
fi
;;
date)
***************
*** 768,774 ****
;;
height)
if [ -d ledger ]; then
! GUILD_NAME=guess_template_param guild_name
ledger -f ledger/chain.ledger bal "$GUILD_NAME":Height | head -n 1 | grep -o "[^ ][0-9.]* XP" | tr -d " XP"
else
echo 0
--- 770,776 ----
;;
height)
if [ -d ledger ]; then
! GUILD_NAME=guess_template_param "guild_name"
ledger -f ledger/chain.ledger bal "$GUILD_NAME":Height | head -n 1 | grep -o "[^ ][0-9.]* XP" | tr -d " XP"
else
echo 0
***************
*** 781,786 ****
--- 783,804 ----
echo "$LAST_TRANSACTION"
fi
;;
+ patch_path)
+ grep ".*\; wild_patch:" ledger/transaction.ledger | grep -o "[^ ]*$"
+ ;;
+ XGG_amount)
+ highest=0
+ IFS="<literal linefeed here>"
+ # shellcheck disable=SC2013
+ for line in $(cat ledger/transaction.ledger); do
+ amt=$( echo "$line" | grep -o "[0-9.] *XGG$" | tr -d "XG " )
+ if [ "$(echo "$amt > $highest" | bc)" != "0" ]; then
+ highest=$amt
+ fi
+ done
+ IFS=$ORIG_IFS
+ echo "$highest"
+ ;;
esac
}
***************
*** 857,863 ****
else
INTAG=true
fi
! elif [ "$INTAG" = "true" ]; then
echo "$line" | grep -o "[^; ].*$"
fi
done
--- 875,881 ----
else
INTAG=true
fi
! elif [ "$INTAG" = "true" ] && [ "$(echo "$line" | grep \;)" != "" ]; then
echo "$line" | grep -o "[^; ].*$"
fi
done
***************
*** 908,913 ****
--- 926,935 ----
if [ "$( echo "$tpl" | grep '^patch .*patch$' )" != "" ]; then
ptpl="$( echo "$tpl" | grep -o '[^ ]*$' )"
build_tpl "$ptpl" "$phash" "$reverse" "$@"
+ elif [ "$( echo "$tpl" | grep '^wild_patch' )" != "" ]; then
+ # fild patch_path from transaction tag
+ patch_path=$(grep ".*\; wild_patch:" ledger/transaction.ledger | grep -o "[^ ]*$")
+ build_tpl "$patch_path" "$phash" "$reverse" "$@"
fi
done
if [ "$reverse" = "" ]; then
***************
*** 1012,1018 ****
echo "#"
echo
fi
! diff -cr -N "$INPATH" "$OUTPATH" -x .git -x ./template/*.patch | sed "s,$INPATH,/old/,g" | sed "s,$OUTPATH,/new/,g"
}
# $1 remote name to check
--- 1034,1040 ----
echo "#"
echo
fi
! diff -cr -N "$INPATH" "$OUTPATH" -x .git -x .\*template/\*.patch -x \*generated_check.ledger | sed "s,$INPATH,/old/,g" | sed "s,$OUTPATH,/new/,g"
}
# $1 remote name to check
diff -cr -N -x .git -x '.*template/*.patch' -x '*generated_check.ledger' /old//gitguild~ /new//gitguild~
*** /old//gitguild~ 1969-12-31 19:00:00.000000000 -0500
--- /new//gitguild~ 2017-01-01 11:32:49.008180488 -0500
***************
*** 0 ****
--- 1,1138 ----
+ #!/bin/sh
+ #MIT License
+ #
+ #Copyright (c) 2016 GitGuild developers
+ #
+ #Permission is hereby granted, free of charge, to any person obtaining a copy
+ #of this software and associated documentation files (the "Software"), to deal
+ #in the Software without restriction, including without limitation the rights
+ #to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ #copies of the Software, and to permit persons to whom the Software is
+ #furnished to do so, subject to the following conditions:
+ #
+ #The above copyright notice and this permission notice shall be included in all
+ #copies or substantial portions of the Software.
+ #
+ #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ #IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ #FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ #AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ #LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ #SOFTWARE.
+
+ ORIG_IFS=$IFS
+
+ # Save $0 so we can shift
+ # $1 must be a cmd.
+ export PROG_NAME=$( echo "$0" | grep -o "[^/]*$" )
+ export COMMAND=$1
+
+ # Git user configuration is a pre-requisite of this script.
+ export USER_NAME=$( git config user.name )
+ export USER_EMAIL=$( git config user.email )
+ export USER_SIGNINGKEY=$( git config user.signingkey )
+ USER_IS_CONFIGURED=true
+
+ # gitolite user home, where repos are hosted
+ # shellcheck disable=SC2116
+ export GIT_HOME=$(echo ~git)
+
+ # default working directory, where repos are cloned
+ export GG_DIR=$HOME"/gitguild"
+
+ # Normally this should be run inside such a git repo
+ GIT_DIR=$( readlink -f "$( git rev-parse -q --git-dir )" | grep -o ".*[^.git]" )
+
+ # change to the root of any git dir for the duration of the script
+ if [ -d "$GIT_DIR" ]; then
+ cd "$GIT_DIR"
+ fi
+
+ if [ "$( which ok.sh )" != "" ]; then
+ export USE_GITHUB=true
+ else
+ export USE_GITHUB=false
+ fi
+
+ if [ "$( which gitolite )" != "" ]; then
+ export USE_GITOLITE=true
+ else
+ export USE_GITOLITE=false
+ fi
+
+ #------------------------CLI Helpers--------------------------
+
+ USAGE_PREAMBLE="
+ \t$PROG_NAME\tA helpful blockchain in a script.
+
+ \tUsage:
+ "
+ GENERAL_USAGE="\t\t$PROG_NAME help\t\tShow the general help.
+ \t\t$PROG_NAME version\tShow the program version.
+
+ \tOptions:
+ "
+
+ USAGE_SUFFIX="\t\t$PROG_NAME <cmd> -h\tShow command help details."
+
+ command_usage_line() {
+ printf "\t\t%s %s\t%s" "$PROG_NAME" "$COMMAND" "$*"
+ }
+ subcommand_usage_line() {
+ SUBCMD=$1
+ shift
+ printf "\t\t%s %s\t%s\t%s" "$PROG_NAME" "$COMMAND" "$SUBCMD" "$*"
+ }
+ # $1 the arg string
+ # $2 the help
+ command_option_line() {
+ OPTSTR=$1
+ shift
+ printf "\t\t%s\t\t%s" "$OPTSTR" "$*"
+ }
+
+
+ #------------------------CLI Handlers-----------------------------
+
+ # The main handler. Takes raw user input from command line.
+ # $1 is the command
+ __main() {
+ case $1 in
+ user)
+ shift
+ handle_user_cmd "$@"
+ ;;
+ ledger)
+ shift
+ get_or_set_all_cfg_values
+ if [ ! $USER_IS_CONFIGURED ]; then
+ exit 1
+ fi
+ handle_ledger_cmd "$@"
+ ;;
+ tx)
+ shift
+ get_or_set_all_cfg_values
+ if [ ! $USER_IS_CONFIGURED ]; then
+ exit 1
+ fi
+ handle_tx_cmd "$@"
+ ;;
+ template)
+ shift
+ handle_tpl_cmd "$@"
+ ;;
+ push)
+ shift
+ get_or_set_all_cfg_values
+ if [ ! $USER_IS_CONFIGURED ]; then
+ exit 1
+ fi
+ gg_push "$@"
+ ;;
+ clone)
+ shift
+ get_or_set_all_cfg_values
+ if [ ! $USER_IS_CONFIGURED ]; then
+ exit 1
+ fi
+ clone_guild "$@"
+ ;;
+ fork)
+ shift
+ get_or_set_all_cfg_values
+ if [ ! $USER_IS_CONFIGURED ]; then
+ exit 1
+ fi
+ gg_fork "$@"
+ ;;
+ version|--version)
+ cat VERSION
+ ;;
+ setup-repo)
+ gname=$(guess_template_param guild_name)
+ if [ "$gname" != "" ]; then
+ setup_repo "$gname"
+ fi
+ ;;
+ *)
+ COMMAND="user"
+ cmdl="$( command_usage_line Manage guild users.)\n"
+ COMMAND="tx"
+ cmdl="$cmdl$( command_usage_line build and check transactions.)\n"
+ COMMAND="ledger"
+ cmdl="$cmdl$( command_usage_line Perform guild-related ledger actions. )\n"
+ COMMAND="clone"
+ cmdl="$cmdl$( subcommand_usage_line \<guild\> \(\<remote\>\) Clone a guild from optional remote. )\n"
+ COMMAND="push"
+ cmdl="$cmdl$( command_usage_line git push with extra checks and remotes. )\n"
+ COMMAND="fork"
+ cmdl="$cmdl$( subcommand_usage_line \<remote\> Fork a guild with one or more remotes. )\n"
+ COMMAND="setup-repo"
+ cmdl="$cmdl$( subcommand_usage_line Setup remotes and hooks in current git repo. )\n"
+ COMMAND="template"
+ cmdl="$cmdl$( command_usage_line Create and list tx templates. )\n"
+ echo "$USAGE_PREAMBLE$cmdl$GENERAL_USAGE$USAGE_SUFFIX"
+ exit
+ ;;
+ esac
+ }
+
+ handle_user_cmd() {
+ case $1 in
+ keygen)
+ gpgkeygen
+ setup_ssh
+ exit
+ ;;
+ unset)
+ git config --global --unset-all user.name
+ git config --global --unset-all user.email
+ git config --global --unset-all user.signingkey
+ exit
+ ;;
+ status)
+ get_or_set_all_cfg_values
+ USERSTR="$USER_NAME $USER_EMAIL $USER_SIGNINGKEY"
+ echo "Operating as user: $USERSTR"
+ ensure_members_uniq
+ exit
+ ;;
+ *)
+ cmdl="$( subcommand_usage_line keygen Generate and/or configure gpg \
+ and ssh keys)\n"
+ cmdl="$cmdl$( subcommand_usage_line unset Unset git user configs.)\n"
+ cmdl="$cmdl$( subcommand_usage_line status Print user status.)\n"
+ echo "$USAGE_PREAMBLE$cmdl$GENERAL_USAGE$USAGE_SUFFIX"
+ exit
+ ;;
+ esac
+ }
+
+ # $1 is now sub-command (build, check)
+ handle_tx_cmd() {
+ case $1 in
+ check)
+ shift
+ check_tx "$@"
+ ;;
+ build)
+ shift
+ # $1 is now a tag name
+ build_tx "$@"
+ ;;
+ list)
+ list_tx_tags
+ ;;
+ archive)
+ shift
+ archive_tx_ledger "$@"
+ ;;
+ finish)
+ finish_tx
+ ;;
+ reset)
+ # $2 is an optional flag to pass to git clean
+ flag="-i"
+ if [ "$2" != "" ]; then
+ flag=$2
+ fi
+ git clean "$flag" -d
+ git reset -q --hard HEAD^
+ git pull -q "$USER_NAME" "$USER_NAME"
+ ;;
+ *)
+ cmdl="$( subcommand_usage_line check Check the tx at HEAD or the given \
+ commit hash. )\n"
+ cmdl="$cmdl$( subcommand_usage_line archive Archive any current transactions \
+ \(put in equity.ledger\). )\n"
+ cmdl="$cmdl$( subcommand_usage_line build \<tag\> Build the given tx \
+ tag, which probably is multiple patches. )\n"
+ cmdl="$cmdl$( subcommand_usage_line finish Perform TX finishing actions, i.e. equity.ledger. )\n"
+ cmdl="$cmdl$( subcommand_usage_line list List the available tx tags. )\n"
+ cmdl="$cmdl$( subcommand_usage_line reset Clean and reset to HEAD. )\n"
+ echo "$USAGE_PREAMBLE$cmdl$GENERAL_USAGE$USAGE_SUFFIX"
+ exit
+ ;;
+ esac
+ }
+
+ # $1 is now sub-command
+ # $@ are params for the sub-command
+ handle_tpl_cmd() {
+ case $1 in
+ create)
+ shift
+ create_patch "$@"
+ ;;
+ build)
+ shift
+ tname="$1"
+ shift
+ if [ "$1" != "" ] && [ "$(echo "$1" | grep .patch$ )" = "" ]; then
+ phash="$1"
+ shift
+ build_tpl "$tname" "$phash" "$@"
+ else
+ build_tpl "$tname" "HEAD" "$@"
+ fi
+ ;;
+ list)
+ if [ "$2" = "" ]; then
+ ls "$GG_DIR"/*/template/*.patch
+ else
+ shift
+ list_tx_tag_templates "$@"
+ fi
+ ;;
+ *)
+ cmdl="$( subcommand_usage_line create Create a stub template for future \
+ transactions. )\n"
+ cmdl="$cmdl$( subcommand_usage_line build \<patch file\> Build the given \
+ template. )\n"
+ cmdl="$cmdl$( subcommand_usage_line list List the available templates. )\n"
+ echo "$USAGE_PREAMBLE$cmdl$GENERAL_USAGE$USAGE_SUFFIX"
+ exit
+ ;;
+ esac
+ }
+
+ # $1 is the name of the guild to clone
+ # $2 is optional remote to clone from. Assumed to be github if not specified.
+ clone_guild() {
+ exists=$( [ ! -d "$GG_DIR/$1" ] || echo true )
+ if [ "$(echo "$1" | grep -E '^[-]{1,2}h[elp]{0,3}$')" = "" ] && [ "$exists" != "true" ]; then
+ if [ "$2" = "" ]; then
+ url="https://github.com/$1/$1.git"
+ else
+ url="$2"
+ fi
+ git clone "$url" "$GG_DIR/$1"
+ setup_repo "$1"
+ else
+ if [ "$exists" = "true" ]; then
+ echo "$GG_DIR/$1 exists. Will not overwrite it."
+ fi
+ cmdl="$( subcommand_usage_line clone \<guild\> \(\<remote\>\) Clone a guild from optional remote. )\n"
+ echo "$USAGE_PREAMBLE$cmdl$GENERAL_USAGE$USAGE_SUFFIX"
+ exit
+ fi
+ }
+
+ # push
+ gg_push() {
+ branch=$( git branch | grep "\*" | tr -d "* " )
+ if [ "$branch" = "$USER_NAME" ]; then
+ for remote in $( git remote ); do
+ if [ "$( use_gitolite_push "$remote" )" ]; then
+ gitolite push -q "$remote" "$branch"
+ else
+ git push -q "$remote" "$branch"
+ fi
+ done
+ git checkout -q master
+ git merge -q "$USER_NAME"
+ # only push master to your own gitolite and github
+ remotes=$( git remote | grep "$USER_NAME" | uniq)
+ for remote in $remotes; do
+ if [ "$( use_gitolite_push "$remote" )" ]; then
+ gitolite push -q "$remote" master
+ else
+ git push -q "$remote" master
+ fi
+ done
+ git checkout -q "$USER_NAME"
+ else
+ echo "You are not on your own branch. Are you sure you want to push?"
+ read writeob
+ echo
+ if [ "$( echo "$writeob" | grep '[yY].*' )" != "" ]; then
+ if [ "$( use_gitolite_push "$USER_NAME" )" ]; then
+ gitolite push -q "$USER_NAME" "$branch"
+ else
+ git push -q "$USER_NAME" "$branch"
+ fi
+ fi
+ fi
+ }
+
+ fork_help() {
+ cmdl="$( subcommand_usage_line fork \<remote\> Fork a guild. )\n"
+ echo "$USAGE_PREAMBLE$cmdl$GENERAL_USAGE$USAGE_SUFFIX"
+ }
+
+ # $1 the name of the guild to fork
+ # $2 remote If none is provided, github is guessed.
+ gg_fork() {
+ if [ "$1" = "" ]; then
+ fork_help
+ exit 1
+ fi
+ remote=$2
+ if [ "$remote" = "" ]; then # guess github
+ remote=https://github.com/"$1/$1".git
+ if "$(github_repo_exists "$1" "$1")" = "false"; then
+ echo "Cannot fork $1. Try forking something else."
+ echo
+ fork_help
+ exit 1
+ fi
+ fi
+ # try to fork using ok.sh's github fork
+ if [ "$USE_GITHUB" = "true" ]; then
+ if [ "$( echo "$remote" | grep github.com )" != "" ]; then
+ _=$( ok.sh fork_repo "$1" "$1" ) # ignore, since always returns repo data
+ else
+ _=$( ok.sh create_repo "$1" 2>&1 )
+ fi
+ fi
+ if [ "$USE_GITOLITE" = "true" ]; then
+ # clone locally if necessary
+ if [ "$( gitolite list-phy-repos | grep "$1" )" = "" ]; then
+ git clone -q --bare "$remote" "$GIT_HOME/repositories/$1.git"
+ gitolite setup
+ fi
+ # add to gitolite.conf
+ # shellcheck disable=SC2016
+ if [ "$( grep 'repo "$1"' "$GG_DIR"/"$USER_NAME"/conf/gitolite.conf )" = "" ]; then
+ cd "$GG_DIR/$USER_NAME"
+ git checkout -q "$USER_NAME"
+ build_tx fork_repo "other_guild=$1"
+ git add -A
+ git commit -m "forked $1"
+ gitguild push
+ fi
+ fi