Skip to content

Commit 35e41c0

Browse files
committed
Pass --noreport to tree
Turns out GitHub Actions is running Ubuntu 2024 LTS and I'm runing 2022 LTS. The versions of tree disagree about the number of directories present. So let's just not print those out for now, until I upgrade.
1 parent 62626ce commit 35e41c0

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

book/src/getting-started/cloning-a-repository.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ command, `--colocate`. `jj` supports two different kinds of repositories:
3030
colocated, and non-colocated. What's the difference? Well, let's take a look
3131
at our repository:
3232

33-
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:10:19}}
33+
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:10:17}}
3434

3535
We have both a `.jj` and a `.git` directory at the top level. This means both
3636
jj's information as git's information are co-located: they're next to each
@@ -44,7 +44,7 @@ at the root of the repository will still work.
4444

4545
Let's see what our repository's history looks like:
4646

47-
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:22:27}}
47+
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:20:25}}
4848

4949
This looks a bit different than `git log`, but it's the same general idea: we
5050
can see where we our in our history.

book/src/getting-started/interacting-with-github.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Let's take one last look at that `jj log` output:
44

5-
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:45:52}}
5+
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:43:50}}
66

77
Do you see that little `trunk` over on the right there? That is a *bookmark*
88
in `jj`, and it's how `jj` understands git branches. `trunk` is the name of
@@ -16,7 +16,7 @@ locally, but when we interact with GitHub, it needs a branch name.
1616

1717
To create a bookmark, we can use `jj bookmark`:
1818

19-
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:54:55}}
19+
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:52:53}}
2020

2121
`jj bookmark create` takes a name for the bookmark, and then we also pass a `-r` flag.
2222
This is short for "revision," which is a sort of catch-all name for the various kinds
@@ -25,7 +25,7 @@ the change ID. In this case, we pass `@-`, which means "the parent of `@`."
2525

2626
Let's look at our log:
2727

28-
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:57:64}}
28+
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:55:62}}
2929

3030
We can now see `goodbye-world` listed on the right. Great! Let's push that up
3131
to GitHub:

book/src/getting-started/making-a-new-change.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ simplest possible workflow. If you're a fan of building up small commits via the
77
If you remember from the end of the last section, we're on an empty change.
88
You can double check with `jj status` (or `jj st`):
99

10-
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:29:32}}
10+
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:27:30}}
1111

1212
So what is a change, anyway? It is the core primitive you'll be working with in
1313
`jj`. We'll talk about that actually means in Part 2. For now, you can think of
@@ -35,7 +35,7 @@ fn main() {
3535

3636
A bit fatalistic, but it works. Let's run `jj st` again:
3737

38-
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:35:40}}
38+
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:33:38}}
3939

4040
We can see we've modified `src/main.rs`. Whenever we run a `jj` command, `jj`
4141
will snapshot all of the changes that we've made to any files in our repository
@@ -51,14 +51,14 @@ but now I love it.
5151
Let's say we're happy with the contents of this change. We're done, and we want
5252
to start working on something else. To do that, we can use `jj commit`:
5353

54-
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:41:43}}
54+
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:39:41}}
5555

5656
Easy enough! Our working copy is now on a fresh new change, and its parent
5757
is our "Goodbye, world!" change that we just committed.
5858

5959
To see our changes in context, let's look at `jj log` again:
6060

61-
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:45:52}}
61+
{{#trycmdinclude tests/tests/cmd/getting-started.trycmd:43:50}}
6262

6363
You can see that we're currently working on an empty change. It has `x` as a
6464
change ID, but there's also a little `@` there: `@` is an alias for the working

tests/tests/cmd/getting-started.trycmd

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,16 @@ Added 4 files, modified 0 files, removed 0 files
99

1010
$ jj config set --repo ui.color never
1111

12-
$ tree . -a -L 1 -C
12+
$ tree . -a -L 1 -C --noreport
13+
.
14+
├── .git
15+
├── .gitignore
16+
├── .jj
17+
├── Cargo.lock
18+
├── Cargo.toml
19+
└── src
20+
21+
3 directories, 3 files
1322

1423
$ jj config set --repo debug.randomness-seed 12347
1524

0 commit comments

Comments
 (0)