Auto merge of #17150 - RalfJung:josh-pull, r=lnicola

internal: add no-new-root check to josh pull

We probably don't want a second root to show up...

Also clear the rust-version file while we are at it.

Author: bors

src/tools/rust-analyzer/rust-version

@@ -1 +0,0 @@
-688c30dc9f8434d63bddb65bd6a4d2258d19717c

src/tools/rust-analyzer/xtask/src/release.rs

@@ -95,6 +95,14 @@ impl flags::RustcPull {
         if !cmd!(sh, "git status --untracked-files=no --porcelain").read()?.is_empty() {
             bail!("working directory must be clean before running `cargo xtask pull`");
         }
+        // This should not add any new root commits. So count those before and after merging.
+        let num_roots = || -> anyhow::Result<u32> {
+            Ok(cmd!(sh, "git rev-list HEAD --max-parents=0 --count")
+                .read()
+                .context("failed to determine the number of root commits")?
+                .parse::<u32>()?)
+        };
+        let num_roots_before = num_roots()?;
         // Make sure josh is running.
         let josh = start_josh()?;
 
@@ -126,6 +134,11 @@ impl flags::RustcPull {
             .run()
             .context("FAILED to merge new commits, something went wrong")?;
 
+        // Check that the number of roots did not increase.
+        if num_roots()? != num_roots_before {
+            bail!("Josh created a new root commit. This is probably not the history you want.");
+        }
+
         drop(josh);
         Ok(())
     }