diff options
| author | flip1995 <hello@philkrones.com> | 2020-06-05 14:47:12 +0200 |
|---|---|---|
| committer | flip1995 <hello@philkrones.com> | 2020-06-05 14:53:23 +0200 |
| commit | 6b9e2e90bf7688bfbcf357fda6e0ef74e11ba1ff (patch) | |
| tree | ac4ed0fa026ce0616169012b23b9221fcd69eee1 | |
| parent | af9a094d9802543196a84169130389733d582f2d (diff) | |
| download | rust-6b9e2e90bf7688bfbcf357fda6e0ef74e11ba1ff.tar.gz rust-6b9e2e90bf7688bfbcf357fda6e0ef74e11ba1ff.zip | |
Replace all remaining occurrences of submodule with subtree
| -rw-r--r-- | doc/changelog_update.md | 2 | ||||
| -rw-r--r-- | doc/release.md | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/changelog_update.md b/doc/changelog_update.md index 0b80cce6d23..6657ab4187b 100644 --- a/doc/changelog_update.md +++ b/doc/changelog_update.md @@ -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 diff --git a/doc/release.md b/doc/release.md index f0a7fe52149..391952ea6b1 100644 --- a/doc/release.md +++ b/doc/release.md @@ -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") ``` |