summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-11-12 19:45:20 +0100
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2023-11-12 19:45:20 +0100
commit74d102ce50f5d71e193a27b899e96739dadeed2f (patch)
tree333dadf38ed34c5d783422b0d6b9f0c03a2b4a58 /pkgs/build-support
parent2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1 (diff)
parent12c5150ee5702e3d87049e88f58f35cc88e0dccf (diff)
downloadnixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar
nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.gz
nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.bz2
nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.lz
nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.xz
nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.zst
nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.zip
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/build-support')
-rwxr-xr-xpkgs/build-support/fetchgit/nix-prefetch-git10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index ae3d28cc231..a3ea0297673 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -261,14 +261,14 @@ make_deterministic_repo(){
     # Remove files that contain timestamps or otherwise have non-deterministic
     # properties.
     if [ -f .git ]; then
-	local dotgit_content=$(<.git)
-	local dotgit_dir="${dotgit_content#gitdir: }"
+        local dotgit_content=$(<.git)
+        local dotgit_dir="${dotgit_content#gitdir: }"
     else
-	local dotgit_dir=".git"
+        local dotgit_dir=".git"
     fi
-    pushd "$dotgit_dir"
+    pushd "$dotgit_dir" >/dev/null
         rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config
-    popd
+    popd >/dev/null
     # Remove all remote branches.
     git branch -r | while read -r branch; do
         clean_git branch -rD "$branch"