diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-17 18:00:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-17 18:00:56 +0000 |
commit | d6b748b2b34de00a07b5620ff4b30c14a7d8078a (patch) | |
tree | 90b3bf6284d194c5e472c16d8bdbbad2db5504b4 /pkgs/build-support | |
parent | 4ee4d805d29afac902a3c631ab13ad08fbe1e84d (diff) | |
parent | a22cd1991064d383f96a786d915507d237e042a0 (diff) | |
download | nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.gz nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.bz2 nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.lz nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.xz nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.tar.zst nixpkgs-d6b748b2b34de00a07b5620ff4b30c14a7d8078a.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 661e0d674c5..8110d670e41 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -140,7 +140,7 @@ url_to_name(){ fi } -# Fetch everything and checkout the right sha1 +# Fetch and checkout the right sha1 checkout_hash(){ local hash="$1" local ref="$2" @@ -149,6 +149,7 @@ checkout_hash(){ hash=$(hash_from_ref "$ref") fi + clean_git fetch ${builder:+--progress} --depth=1 origin "$hash" || \ clean_git fetch -t ${builder:+--progress} origin || return 1 local object_type=$(git cat-file -t "$hash") |