fixup! Josh preparations

clippy_dev/src/sync.rs

@@ -105,7 +105,7 @@ pub fn rustc_pull() {
     );
 
     let message = format!("Bump nightly version -> {date}");
-    cmd!(sh, "git commit rust-version --no-verify -m {message}")
+    cmd!(sh, "git commit rust-toolchain --no-verify -m {message}")
         .run()
         .expect("FAILED to commit rust-toolchain file, something went wrong");
 
@@ -158,7 +158,6 @@ pub fn rustc_pull() {
 
 pub fn rustc_push(rustc_path: String, github_user: String) {
     const BRANCH: &str = "clippy-subtree-update";
-    let base = rustc_version();
 
     let sh = Shell::new().expect("failed to create shell");
     sh.change_dir(clippy_project_root());
@@ -174,8 +173,10 @@ pub fn rustc_push(rustc_path: String, github_user: String) {
     }
 
     // Prepare the branch. Pushing works much better if we use as base exactly
-    // the commit that we pulled from last time, so we use the `rust-version`
-    // file to find out which commit that would be.
+    // the commit that we pulled from last time, so we use the `rustc --version`
+    // to find out which commit that would be.
+    let base = rustc_version();
+
     println!("Preparing {github_user}/rust (base: {base})...");
     sh.change_dir(rustc_path);
     if cmd!(sh, "git fetch https://github.com/{github_user}/rust {BRANCH}")