Skip to content

Commit

Permalink
Auto merge of rust-lang#5687 - flip1995:release_doc, r=phansch
Browse files Browse the repository at this point in the history
Replace all remaining occurrences of submodule with subtree

r? @phansch

I should have included this in rust-lang#5686, but forgot about it, so here we go again.

changelog: none
  • Loading branch information
bors committed Jun 5, 2020
2 parents 6fc9939 + 6b9e2e9 commit b16d101
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion doc/changelog_update.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions doc/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
```


Expand Down

0 comments on commit b16d101

Please sign in to comment.