From: Matthijs van Otterdijk <matthijs@wirevirt.net>
Date: Thu, 14 Jul 2022 11:17:38 +0000 (+0200)
Subject: bootstrap: always use commit info file instead of checking .git
X-Git-Tag: archive/raspbian/1.85.0+dfsg3-1+rpi1^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1d7500bcf36a84e97587ee6499473ae4aed2d851;p=rustc.git

bootstrap: always use commit info file instead of checking .git

Forwarded: not-needed

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-disable-git.patch
---

diff --git a/src/bootstrap/src/utils/channel.rs b/src/bootstrap/src/utils/channel.rs
index 4a9ecc7a4f..8f98bfad91 100644
--- a/src/bootstrap/src/utils/channel.rs
+++ b/src/bootstrap/src/utils/channel.rs
@@ -36,12 +36,13 @@ pub struct Info {
 impl GitInfo {
     pub fn new(omit_git_hash: bool, dir: &Path) -> GitInfo {
         // See if this even begins to look like a git dir
-        if !dir.join(".git").exists() {
+        // Debian: always use commit info file, since our .git is not upstreams..
+        //if !dir.join(".git").exists() {
             match read_commit_info_file(dir) {
                 Some(info) => return GitInfo::RecordedForTarball(info),
                 None => return GitInfo::Absent,
             }
-        }
+        //}
 
         // Make sure git commands work
         match helpers::git(Some(dir)).arg("rev-parse").as_command_mut().output() {