mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-10 23:24:24 +00:00
Replace all remaining occurrences of submodule with subtree
This commit is contained in:
parent
af9a094d98
commit
6b9e2e90bf
2 changed files with 3 additions and 5 deletions
|
@ -18,7 +18,7 @@ been very rare that Clippy changes were included in a patch release.
|
|||
|
||||
### 1. Finding the relevant Clippy commits
|
||||
|
||||
Each Rust release ships with its own version of Clippy. The Clippy submodule can
|
||||
Each Rust release ships with its own version of Clippy. The Clippy subtree can
|
||||
be found in the `tools` directory of the Rust repository.
|
||||
|
||||
Depending on the current time and what exactly you want to update, the following
|
||||
|
|
|
@ -59,8 +59,7 @@ determined.
|
|||
```bash
|
||||
# Assuming the current directory corresponds to the Rust repository
|
||||
$ git checkout beta
|
||||
$ git submodule update
|
||||
$ BETA_SHA=$(git submodule status src/tools/clippy | awk '{print $1}')
|
||||
$ BETA_SHA=$(git log --oneline -- src/tools/clippy/ | grep -o "Merge commit '[a-f0-9]*' into .*" | head -1 | sed -e "s/Merge commit '\([a-f0-9]*\)' into .*/\1/g")
|
||||
```
|
||||
|
||||
After finding the Clippy commit, the `beta` branch in the Clippy repository can
|
||||
|
@ -83,8 +82,7 @@ release. This commit can be found in the Rust repository.
|
|||
# Assuming the current directory corresponds to the Rust repository
|
||||
$ git fetch upstream # `upstream` is the `rust-lang/rust` remote
|
||||
$ git checkout 1.XX.0 # XX should be exchanged with the corresponding version
|
||||
$ git submodule update
|
||||
$ SHA=$(git submodule status src/tools/clippy | awk '{print $1}')
|
||||
$ SHA=$(git log --oneline -- src/tools/clippy/ | grep -o "Merge commit '[a-f0-9]*' into .*" | head -1 | sed -e "s/Merge commit '\([a-f0-9]*\)' into .*/\1/g")
|
||||
```
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue