1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
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() {
|
