fetchTree/fetchGit: fix ref not respected when rev is set

fixes NixOS#9667
DavHau · Dec 27, 2023 · 0075cab · 0075cab
1 parent e23983d
commit 0075cab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/libfetchers/git-utils.cc b/src/libfetchers/git-utils.cc
@@ -381,9 +381,7 @@ struct GitRepoImpl : GitRepo, std::enable_shared_from_this<GitRepoImpl>
         };
 
         git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;
-        // FIXME: for some reason, shallow fetching over ssh barfs
-        // with "could not read from remote repository".
-        opts.depth = shallow && parseURL(url).scheme != "ssh" ? 1 : GIT_FETCH_DEPTH_FULL;
+        opts.depth = GIT_FETCH_DEPTH_FULL;
         opts.callbacks.payload = &act;
         opts.callbacks.sideband_progress = sidebandProgressCallback;
         opts.callbacks.transfer_progress = transferProgressCallback;

diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
@@ -527,8 +527,6 @@ struct GitInputScheme : InputScheme
                     auto fetchRef =
                         getAllRefsAttr(input)
                         ? "refs/*"
-                        : input.getRev()
-                        ? input.getRev()->gitRev()
                         : ref.compare(0, 5, "refs/") == 0
                         ? ref
                         : ref == "HEAD"