git: remove workaround for "cannot find git revision"

NixOS/nix#8050 has been merged
nix-community · Apr 27, 2023 · b8ab031 · b8ab031
1 parent 8865d05
commit b8ab031
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/src/fetcher/git.rs b/src/fetcher/git.rs
@@ -32,7 +32,6 @@ impl<'a> Fetchgit {
     ) -> Result<String> {
         if args.is_empty() && args_str.is_empty() {
             git_prefetch(matches!(self.0, GitScheme::Yes), url, rev, !submodules)
-                .or_else(|_| self.fetch_fod(values, rev, submodules, args, args_str, nixpkgs))
         } else {
             self.fetch_fod(values, rev, submodules, args, args_str, nixpkgs)
         }

diff --git a/src/fetcher/gitea.rs b/src/fetcher/gitea.rs
@@ -57,7 +57,6 @@ impl FetchFromGitea<'_> {
                     rev,
                     true,
                 )
-                .or_else(|_| self.fetch_fod(values, rev, submodules, args, args_str, nixpkgs))
             } else {
                 url_prefetch(
                     format!("https://{}/{owner}/{repo}/archive/{rev}.tar.gz", self.0),

diff --git a/src/prefetch.rs b/src/prefetch.rs
@@ -59,7 +59,7 @@ pub fn git_prefetch(git_scheme: bool, url: &str, rev: &str, submodules: bool) ->
     let submodules = if submodules { "&submodules=1" } else { "" };
 
     if rev.len() == 40 {
-        flake_prefetch(format!("{prefix}{url}?rev={rev}{submodules}"))
+        flake_prefetch(format!("{prefix}{url}?allRefs=1&rev={rev}{submodules}"))
     } else {
         if !rev.starts_with("refs/") {
             if let hash @ Ok(_) =

diff --git a/src/simple.rs b/src/simple.rs
@@ -292,7 +292,6 @@ pub trait SimpleGitFetcher<'a, const N: usize>: SimpleFetcher<'a, N> {
                     rev,
                     !Self::SUBMODULES_DEFAULT,
                 )
-                .or_else(|_| self.fetch_fod(values, rev, submodules, args, args_str, nixpkgs))
             } else {
                 flake_prefetch(self.get_flake_ref(values, rev))
             }