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.91.1+dfsg1-1+rpi1~1^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5c91ca6da75972c6dd9b74284229c7123a3919ca;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 21b4257e54..6b4feb1568 100644
--- a/src/bootstrap/src/utils/channel.rs
+++ b/src/bootstrap/src/utils/channel.rs
@@ -37,12 +37,13 @@ pub struct Info {
 impl GitInfo {
     pub fn new(omit_git_hash: bool, dir: &Path, exec_ctx: impl AsRef<ExecutionContext>) -> 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,
             }
-        }
+        //}
 
         let mut git_command = helpers::git(Some(dir));
         git_command.arg("rev-parse");