From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 14 Jul 2022 11:17:38 +0000 (+0200)
Subject: d-bootstrap-read-beta-version-from-file
X-Git-Tag: archive/raspbian/1.63.0+dfsg1-2_deb10u2+rpi1^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=50fa52a823fe79803668614a39a07bcff100cb10;p=rustc-mozilla.git

d-bootstrap-read-beta-version-from-file

===================================================================

Gbp-Pq: Name d-bootstrap-read-beta-version-from-file.patch
---

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 4ac857b47..de57140a7 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -1267,15 +1267,13 @@ impl Build {
             return s;
         }
 
-        // Figure out how many merge commits happened since we branched off master.
-        // That's our beta number!
-        // (Note that we use a `..` range, not the `...` symmetric difference.)
+        // Debian: read beta number from "version" file, this is only available
+        // in the rustc upstream tarballs and not their git
         let count = output(
-            Command::new("git")
-                .arg("rev-list")
-                .arg("--count")
-                .arg("--merges")
-                .arg("refs/remotes/origin/master..HEAD")
+            Command::new("sed")
+                .arg("-re")
+                .arg(r"s/[0-9]+.[0-9]+.[0-9]+-beta.([0-9]+) \(.*\)/\1/g")
+                .arg("version")
                 .current_dir(&self.src),
         );
         let n = count.trim().parse().unwrap();