@@ -192,7 +192,7 @@ For general information about `subtree`s in the Rust repository see [Rust's
192
192
### Patching git-subtree to work with big repos
193
193
194
194
Currently there's a bug in ` git-subtree ` that prevents it from working properly
195
- with the [ ` rust-lang/rust ` ] repo. There's an open PR to fix that, but it's stall .
195
+ with the [ ` rust-lang/rust ` ] repo. There's an open PR to fix that, but it's stale .
196
196
Before continuing with the following steps, we need to manually apply that fix to
197
197
our local copy of ` git-subtree ` .
198
198
@@ -203,7 +203,7 @@ and make sure it has the proper permissions:
203
203
``` bash
204
204
sudo cp --backup /path/to/patched/git-subtree.sh /usr/lib/git-core/git-subtree
205
205
sudo chmod --reference=/usr/lib/git-core/git-subtree~ /usr/lib/git-core/git-subtree
206
- sudo chown root:root /usr/lib/git-core/git-subtree
206
+ sudo chown --reference=/usr/lib/git-core/git-subtree~ /usr/lib/git-core/git-subtree
207
207
```
208
208
209
209
_ Note:_ The first time running ` git subtree push ` a cache has to be built. This
@@ -248,9 +248,11 @@ to be run inside the `rust` directory):
248
248
249
249
To avoid flooding the [` rust-lang/rust` ] PR queue, changes in Clippy' s repo are synced back
250
250
in a bi-weekly basis if there' s no urgent changes. This is done starting on the day of
251
- the Rust stable release and then every two other weeks . That way we guarantee that
251
+ the Rust stable release and then every other week . That way we guarantee that
252
252
every feature in Clippy is available for 2 weeks in nightly, before it can get to beta.
253
- For reference, the first sync following this cadence was performed the 2020-08-27.
253
+ For reference, the first sync following this cadence was performed the 2020-08-27.
254
+
255
+ All of the following commands have to be run inside the ` rust` directory.
254
256
255
257
1. Make sure Clippy itself is up-to-date by following the steps outlined in the previous
256
258
section if necessary.
0 commit comments