Radish alpha
h
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
cli/test: Explicitly set -o sync for relevant pushes
Adrian Duke committed 2 months ago
commit cd983e02bc39c689841ea0fd114117e423178ee6
parent 41416af2bc8bd0c2f7e9b67c46cc29e4f71478e0
17 files changed +42 -42
modified crates/radicle-cli/examples/git/git-push-amend.md
@@ -20,7 +20,7 @@ $ git commit --amend -m "Neue Änderungen" --allow-empty -q
```

``` ~alice (stderr)
-
$ git push rad master -f
+
$ git push rad master -f -o sync
✓ Canonical reference refs/heads/master updated to target commit 9170c8795d3a78f0381a0ffafb20ea69fb0f5b6b
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
modified crates/radicle-cli/examples/git/git-push-canonical-annotated-tags.md
@@ -96,7 +96,7 @@ tag
```

``` ~alice (stderr)
-
$ git push rad --tags
+
$ git push rad --tags -o sync
✓ Canonical reference refs/tags/v1.0-hotfix updated to target tag ac51a0746a5e8311829bc481202909a1e3acc0c2
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -139,7 +139,7 @@ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential s
✓ Target met: 1 seed(s)
✓ Remote alice added
✓ Remote-tracking branch alice/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-
$ git push rad master
+
$ git push rad master -o sync
```

``` ~alice
@@ -179,7 +179,7 @@ ac51a0746a5e8311829bc481202909a1e3acc0c2

``` ~bob (stderr)
$ git tag -a -m "Release 2" v2.0
-
$ git push rad --tags
+
$ git push rad --tags -o sync
warn: could not determine target for canonical reference 'refs/tags/v2.0', no object with at least 2 vote(s) found (threshold not met)
warn: it is recommended to find an object (either commit or tag) to agree upon
✓ Synced with 1 seed(s)
@@ -206,7 +206,7 @@ $ git tag v2.0 bob/tags/v2.0
```

``` ~alice (stderr)
-
$ git push rad --tags
+
$ git push rad --tags -o sync
✓ Canonical reference refs/tags/v2.0 updated to target tag 89f935f27a16f8ed97915ade4accab8fe48057aa
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -223,7 +223,7 @@ reference is created:

``` ~bob (stderr)
$ git tag qa/v2.1
-
$ git push rad --tags
+
$ git push rad --tags -o sync
✓ Canonical reference refs/tags/qa/v2.1 updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
modified crates/radicle-cli/examples/git/git-push-canonical-lightweight-tags.md
@@ -94,7 +94,7 @@ $ git tag v1.0-hotfix
```

``` ~alice (stderr)
-
$ git push rad --tags
+
$ git push rad --tags -o sync
✓ Canonical reference refs/tags/v1.0-hotfix updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -137,7 +137,7 @@ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential s
✓ Target met: 1 seed(s)
✓ Remote alice added
✓ Remote-tracking branch alice/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-
$ git push rad master
+
$ git push rad master -o sync
```

``` ~alice
@@ -170,7 +170,7 @@ no quorum was found for the new tag:

``` ~bob (stderr)
$ git tag v2.0
-
$ git push rad --tags
+
$ git push rad --tags -o sync
warn: could not determine target for canonical reference 'refs/tags/v2.0', no object with at least 2 vote(s) found (threshold not met)
warn: it is recommended to find an object (either commit or tag) to agree upon
✓ Synced with 1 seed(s)
@@ -197,7 +197,7 @@ $ git tag v2.0 bob/tags/v2.0
```

``` ~alice (stderr)
-
$ git push rad --tags
+
$ git push rad --tags -o sync
✓ Canonical reference refs/tags/v2.0 updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -214,7 +214,7 @@ reference is created:

``` ~bob (stderr)
$ git tag qa/v2.1
-
$ git push rad --tags
+
$ git push rad --tags -o sync
✓ Canonical reference refs/tags/qa/v2.1 updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
modified crates/radicle-cli/examples/git/git-push-converge.md
@@ -93,7 +93,7 @@ She can then force push to update the canonical head to the new agreed upon
commit:

``` ~alice (stderr)
-
$ git push rad -f
+
$ git push rad -f -o sync
warn: could not determine target for canonical reference 'refs/heads/master', no object with at least 3 vote(s) found (threshold not met)
warn: it is recommended to find an object (either commit or tag) to agree upon
✓ Synced with 2 seed(s)
@@ -118,7 +118,7 @@ that Alice, Bob, and Eve all have this commit as part of their history it has
become the canonical `master`.

``` ~bob (stderr)
-
$ git push rad
+
$ git push rad -o sync
✓ Canonical reference refs/heads/master updated to target commit 3a75f66dd0020c9a0355cc6ec21f15de989e2001
✓ Synced with 2 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
@@ -139,7 +139,7 @@ HEAD is now at 0f9bd80 Merge remote-tracking branch 'eve/master'
```

``` ~eve (stderr)
-
$ git push rad
+
$ git push rad -o sync
✓ Canonical reference refs/heads/master updated to target commit 0f9bd8035c04b3f73f5408e73e8454879b20800b
✓ Synced with 2 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
modified crates/radicle-cli/examples/git/git-push-diverge.md
@@ -19,7 +19,7 @@ $ rad inspect --delegates
did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
$ git commit -m "Third commit" --allow-empty -q
-
$ git push rad
+
$ git push rad -o sync
$ git branch -arv
  alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master f2de534 Second commit
  rad/master                                                    319a7dc Third commit
@@ -42,7 +42,7 @@ If we try to push now, we get an error with a hint, telling us that we need to
integrate Bob's changes before pushing ours:

``` ~alice (stderr)
-
$ git push rad
+
$ git push rad -o sync
warn: could not determine target commit for canonical reference 'refs/heads/master', found diverging commits 2e8758fc512cbdef298c86feddff5ba3280e94b4 and 319a7dc3b195368ded4b099f8c90bbb80addccd3, with base commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 and threshold 1
warn: it is recommended to find a commit to agree upon
✓ Synced with 1 seed(s)
modified crates/radicle-cli/examples/git/git-push-rollback.md
@@ -16,7 +16,7 @@ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential s
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
$ git commit -m "Third commit" --allow-empty -q
-
$ git push rad
+
$ git push rad -o sync
$ git branch -arv
  alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master f2de534 Second commit
  rad/master                                                    319a7dc Third commit
@@ -34,7 +34,7 @@ Fast-forward
```

``` ~alice (stderr)
-
$ git push rad
+
$ git push rad -o sync
✓ Canonical reference refs/heads/master updated to target commit 319a7dc3b195368ded4b099f8c90bbb80addccd3
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -53,7 +53,7 @@ Since the canonical head is still decidable from this commit she is allowed to
push and the new canonical head becomes the previous commit again:

``` ~alice (stderr)
-
$ git push rad -f
+
$ git push rad -f -o sync
✓ Canonical reference refs/heads/master updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
modified crates/radicle-cli/examples/git/git-tag.md
@@ -11,7 +11,7 @@ $ git tag v1.0 -a -m "Release v1.0"
```

``` ~alice (stderr)
-
$ git push rad v1.0
+
$ git push rad v1.0 -o sync
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 * [new tag]         v1.0 -> v1.0
@@ -63,7 +63,7 @@ Updated tag 'v1.0' (was be18ed6)
```

``` ~alice (stderr)
-
$ git push rad v1.0 -f
+
$ git push rad v1.0 -f -o sync
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 + be18ed6...9dbdebc v1.0 -> v1.0 (forced update)
modified crates/radicle-cli/examples/rad-inbox.md
@@ -9,11 +9,11 @@ $ cd heartwood
$ rad issue open --title "No license file" --description "..." -q
✓ Synced with 1 seed(s)
$ git commit -m "Change copyright" --allow-empty -q
-
$ git push rad HEAD:bob/copy
+
$ git push rad HEAD:bob/copy -o sync
$ cd ..
$ cd radicle-git
$ git commit -m "Change copyright" --allow-empty -q
-
$ git push rad -o patch.message="Copyright fixes" HEAD:refs/patches
+
$ git push rad -o patch.message="Copyright fixes" HEAD:refs/patches -o sync
```

``` ~alice
modified crates/radicle-cli/examples/rad-patch-checkout-force.md
@@ -12,7 +12,7 @@ $ git commit -v -m "Define power requirements"
```

``` ~alice (stderr)
-
$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
+
$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches -o sync
✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -45,7 +45,7 @@ $ git commit --message "Add README, just for the fun"
```

``` ~alice (stderr)
-
$ git push rad -o patch.message="Add README, just for the fun"
+
$ git push rad -o patch.message="Add README, just for the fun" -o sync
✓ Patch aa45913 updated to revision 3156bed9d64d4675d6cf56612d217fc5f4e8a53a
To compare against your previous revision aa45913, run:

modified crates/radicle-cli/examples/rad-patch-delete.md
@@ -9,7 +9,7 @@ $ git commit -m "Introduce license"
```

``` ~alice (stderr)
-
$ git push rad -o patch.draft -o patch.message="Define LICENSE for project" HEAD:refs/patches
+
$ git push rad -o patch.draft -o patch.message="Define LICENSE for project" HEAD:refs/patches -o sync
✓ Patch 6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b drafted
✓ Synced with 2 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -68,7 +68,7 @@ $ git commit -am "Add MIT License"
```

``` ~alice (stderr)
-
$ git push -f
+
$ git push -f -o sync
✓ Patch 6c61ef1 updated to revision 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3
To compare against your previous revision 6c61ef1, run:

modified crates/radicle-cli/examples/rad-patch-detached-head.md
@@ -29,7 +29,7 @@ Now, we can create a commit on top of this and create a patch, as usual:

``` (stderr) RAD_HINT=1
$ git commit -a -m "Add things" -q --allow-empty
-
$ git push -o patch.message="Add things #1" -o patch.message="See commits for details." rad HEAD:refs/patches
+
$ git push -o patch.message="Add things #1" -o patch.message="See commits for details." rad HEAD:refs/patches -o sync
✓ Patch 6035d2f582afbe01ff23ea87528ae523d76875b6 opened
hint: offline push, your node is not running
hint: to sync with the network, run `rad node start`
modified crates/radicle-cli/examples/rad-patch-fetch-1.md
@@ -7,7 +7,7 @@ $ git checkout -b alice/1 -q
$ git commit --allow-empty -m "Change #1" -q
$ git rev-parse HEAD
7461703ce0fda972df450d071d1d3702057a6352
-
$ git push rad HEAD:alice/1
+
$ git push rad HEAD:alice/1 -o sync
```

``` ~bob
modified crates/radicle-cli/examples/rad-patch-open-explore.md
@@ -3,7 +3,7 @@ When preferred seeds are configured, opening a patch outputs the patch URL.
``` (stderr)
$ git checkout -b changes -q
$ git commit --allow-empty -q -m "Changes"
-
$ git push rad HEAD:refs/patches
+
$ git push rad HEAD:refs/patches -o sync
✓ Patch acab0ec777a97d013f30be5d5d1aec32562ecb02 opened
✓ Synced with 1 seed(s)

@@ -17,7 +17,7 @@ If we update the patch, the URL is also output.

``` (stderr)
$ git commit --amend --allow-empty -q -m "Other changes"
-
$ git push -f
+
$ git push -f -o sync
✓ Patch acab0ec updated to revision f7a830d829d0cdf398f63a32b0d5ee31f08e21ab
To compare against your previous revision acab0ec, run:

@@ -36,7 +36,7 @@ While simply pushing a commit outputs a URL to the new source tree.
``` (stderr)
$ git checkout master -q
$ git merge changes -q
-
$ git push rad master
+
$ git push rad master -o sync
✓ Patch acab0ec777a97d013f30be5d5d1aec32562ecb02 merged
✓ Canonical reference refs/heads/master updated to target commit b2b6432af93f8fe188e32d400263021b602cfec8
✓ Synced with 1 seed(s)
modified crates/radicle-cli/examples/rad-patch-pull-update.md
@@ -42,7 +42,7 @@ our fork:

``` ~bob (stderr)
$ cd heartwood
-
$ git push rad master
+
$ git push rad master -o sync
✓ Synced with 1 seed(s)
To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
 * [new branch]      master -> master
@@ -53,7 +53,7 @@ Bob then opens a patch.
``` ~bob (stderr)
$ git checkout -b bob/feature -q
$ git commit --allow-empty -m "Bob's commit #1" -q
-
$ git push rad -o sync -o patch.message="Bob's patch" HEAD:refs/patches
+
$ git push rad -o sync -o patch.message="Bob's patch" HEAD:refs/patches -o sync
✓ Patch 55b9721ed7f6bfec38f43729e9b6631c5dc812fb opened
✓ Synced with 1 seed(s)
To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
@@ -82,7 +82,7 @@ Bob then updates the patch.

``` ~bob (stderr)
$ git commit --allow-empty -m "Bob's commit #2" -q
-
$ git push rad -o sync -o patch.message="Updated."
+
$ git push rad -o sync -o patch.message="Updated." -o sync
✓ Patch 55b9721 updated to revision f91e056da05b2d9a58af1160c76245bc3debf7a8
To compare against your previous revision 55b9721, run:

modified crates/radicle-cli/examples/rad-push-and-pull-patches.md
@@ -4,7 +4,7 @@ Testing pulling, fetching and the `FETCH_HEAD`.
$ git push rad
$ git checkout -b bob/1 -q
$ git commit --allow-empty -m "Changes #1" -q
-
$ git push -o patch.message="Changes" rad HEAD:refs/patches
+
$ git push -o patch.message="Changes" rad HEAD:refs/patches -o sync
```

``` ~alice
@@ -32,7 +32,7 @@ f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
``` ~alice (stderr)
$ git checkout patch/d004b67 -q
$ git commit --allow-empty -m "Changes #2" -q
-
$ git push
+
$ git push -o sync
✓ Patch d004b67 updated to revision 2eb705c3da98e05c083df15be5b1bd6856a0bd77
To compare against your previous revision d004b67, run:

@@ -45,7 +45,7 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE

``` ~bob
$ git commit --allow-empty -m "Changes #2" -q
-
$ git push
+
$ git push -o sync
```

``` ~alice (stderr)
@@ -55,7 +55,7 @@ From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
 + c2aaf1c...8d5f1ba patches/d004b67355456c46de10c0d287e4a791ad1a6945 -> rad/patches/d004b67355456c46de10c0d287e4a791ad1a6945  (forced update)
$ git checkout - -q
$ git commit --allow-empty -m "Changes #3" -q
-
$ git push
+
$ git push -o sync
✓ Patch d004b67 updated to revision 7b5015a8dac188bb0d44a334aa68a51298750b07
To compare against your previous revision d004b67, run:

modified crates/radicle-cli/examples/rad-watch.md
@@ -12,7 +12,7 @@ f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
$ git commit --allow-empty -m "Minor update" -q
$ git rev-parse master
e09c4dc1b54443ceea715ea648afecdcfd1dd7d0
-
$ git push rad master
+
$ git push rad master -o sync
```

``` ~bob
modified crates/radicle-cli/examples/workflow/5-patching-maintainer.md
@@ -91,7 +91,7 @@ Fast-forward
 create mode 100644 REQUIREMENTS.md
```
``` (stderr)
-
$ git push rad master
+
$ git push rad master -o sync
✓ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 merged at revision 9d62420
✓ Canonical reference refs/heads/master updated to target commit f567f695d25b4e8fb63b5f5ad2a584529826e908
✓ Synced with 1 seed(s)
@@ -128,7 +128,7 @@ $ rad patch show e4934b6
To publish our new state to the network, we simply push:

```
-
$ git push
+
$ git push -o sync
```

Finally, we will close the issue that was opened for this