mirror of
https://seed.radicle.dev/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5.git
synced 2026-11-16 00:00:37 +08:00
Lorenz Leutgeb
0e3f3f03d2
Pay more attention to when a Node ID is displayed in compact form. As this was sometimes used to save space, e.g. in `rad node status` in combination with long node addresses (like .onion names), also implement a compact format for node addresses and use that instead in some cases. Progress notifications in spinners keep the short form.
38 lines
1.2 KiB
Markdown
38 lines
1.2 KiB
Markdown
Now that the patch is merged, we can update our master branch to the canonical
|
|
master, which includes our patch.
|
|
|
|
First, we confirm that our master is behind:
|
|
```
|
|
$ git rev-parse master
|
|
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
|
|
```
|
|
|
|
Then, we call `rad sync --fetch` to fetch from the maintainer:
|
|
```
|
|
$ rad sync --fetch
|
|
Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
|
|
✓ Target met: 1 seed(s)
|
|
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
```
|
|
|
|
Now let's checkout `master` and pull the maintainer's changes:
|
|
```
|
|
$ git checkout master
|
|
Your branch is up to date with 'rad/master'.
|
|
```
|
|
``` (stderr) RAD_SOCKET=/dev/null
|
|
$ git pull --all --ff
|
|
From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
|
|
f2de534..f567f69 master -> rad/master
|
|
From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
f2de534..f567f69 master -> alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
|
|
```
|
|
|
|
Now our master branch is up to date with the maintainer's master:
|
|
|
|
```
|
|
$ git rev-parse master
|
|
f567f695d25b4e8fb63b5f5ad2a584529826e908
|
|
$ git diff master..alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
|
|
```
|