mirror of
https://git.proxmox.com/git/rustc
synced 2025-08-25 02:53:35 +00:00
b1ff7e314b
including rust-analyzer Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From: Matthijs van Otterdijk <matthijs@wirevirt.net>
|
|
Date: Thu, 14 Jul 2022 13:17:38 +0200
|
|
Subject: bootstrap: always use commit info file instead of checking .git
|
|
|
|
Forwarded: not-needed
|
|
---
|
|
src/bootstrap/src/utils/channel.rs | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/bootstrap/src/utils/channel.rs b/src/bootstrap/src/utils/channel.rs
|
|
index 4a9ecc7..8f98bfa 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() {
|