From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Tue, 1 Dec 2020 19:57:48 +0000 (+0000)
Subject: d-read-beta-version-from-file
X-Git-Tag: archive/raspbian/1.48.0+dfsg1-1+rpi1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=615b1815e403960a2e13da785998a81aaf3d8b21;p=rustc.git

d-read-beta-version-from-file

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

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

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index ecb8abb45c..919408cc9f 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -1009,15 +1009,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();