From aadfb682d41881e261b929266dc3192794562a3c Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Mon, 21 Jul 2025 22:01:05 -0700 Subject: [PATCH] Fix fetchGit functional tests to peel as well --- tests/functional/fetchGit.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/fetchGit.sh b/tests/functional/fetchGit.sh index dc5d8f818..e7c9c77a5 100755 --- a/tests/functional/fetchGit.sh +++ b/tests/functional/fetchGit.sh @@ -236,10 +236,10 @@ path9=$(nix eval --impure --raw --expr "(builtins.fetchGit { url = \"file://$rep # Specifying a ref without a rev shouldn't pick a cached rev for a different ref export _NIX_FORCE_HTTP=1 rev_tag1_nix=$(nix eval --impure --raw --expr "(builtins.fetchGit { url = \"file://$repo\"; ref = \"refs/tags/tag1\"; }).rev") -rev_tag1=$(git -C $repo rev-parse refs/tags/tag1) +rev_tag1=$(git -C $repo rev-parse refs/tags/tag1^{commit}) [[ $rev_tag1_nix = $rev_tag1 ]] rev_tag2_nix=$(nix eval --impure --raw --expr "(builtins.fetchGit { url = \"file://$repo\"; ref = \"refs/tags/tag2\"; }).rev") -rev_tag2=$(git -C $repo rev-parse refs/tags/tag2) +rev_tag2=$(git -C $repo rev-parse refs/tags/tag2^{commit}) [[ $rev_tag2_nix = $rev_tag2 ]] unset _NIX_FORCE_HTTP