From bc4547b58c3f8081644281b82e29eb86c78eaa88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 May 2025 09:19:40 +0200 Subject: [PATCH] fetchGit: don't compute revCount on shallow repository This can never work and leads to a crash bug. (cherry picked from commit 0479db934c9412443aac5bf563e9dc4538eba7f1) # Conflicts: # src/libfetchers/git.cc --- src/libfetchers/git.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc index 492867dc4..e72cc913f 100644 --- a/src/libfetchers/git.cc +++ b/src/libfetchers/git.cc @@ -798,8 +798,15 @@ struct GitInputScheme : InputScheme auto rev = repoInfo.workdirInfo.headRev.value_or(nullRev); input.attrs.insert_or_assign("rev", rev.gitRev()); +<<<<<<< HEAD input.attrs.insert_or_assign("revCount", rev == nullRev ? 0 : getRevCount(repoInfo, repoPath, rev)); +======= + if (!getShallowAttr(input)) { + input.attrs.insert_or_assign("revCount", + rev == nullRev ? 0 : getRevCount(*input.settings, repoInfo, repoPath, rev)); + } +>>>>>>> 0479db934 (fetchGit: don't compute revCount on shallow repository) verifyCommit(input, repo); } else {