summary refs log tree commit diff
diff options
context:
space:
mode:
authorBenno Fünfstück <benno.fuenfstueck@gmail.com>2014-06-11 14:09:58 +0200
committerBenno Fünfstück <benno.fuenfstueck@gmail.com>2014-06-11 14:09:58 +0200
commitbe25ce8f5837eed6ada3c0da815b6fa189798c11 (patch)
tree3d400625146d1dd75bef58787c7a05fc15540e39
parenta46c4d976ccb9cb728adda20a7574af250f71a50 (diff)
downloadnixpkgs-be25ce8f5837eed6ada3c0da815b6fa189798c11.tar
nixpkgs-be25ce8f5837eed6ada3c0da815b6fa189798c11.tar.gz
nixpkgs-be25ce8f5837eed6ada3c0da815b6fa189798c11.tar.bz2
nixpkgs-be25ce8f5837eed6ada3c0da815b6fa189798c11.tar.lz
nixpkgs-be25ce8f5837eed6ada3c0da815b6fa189798c11.tar.xz
nixpkgs-be25ce8f5837eed6ada3c0da815b6fa189798c11.tar.zst
nixpkgs-be25ce8f5837eed6ada3c0da815b6fa189798c11.zip
nix-prefetch-git: fix printing of revision
If the user explictly gives a ref such as "refs/heads/master", `git
rev-parse` failed because we only checked out the `fetchgit`
branch. Now, we also try `git rev-parse fetchgit` if the first call
fails, which fixes the issue.
-rwxr-xr-xpkgs/build-support/fetchgit/nix-prefetch-git2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index d4819574acb..3574f3b7539 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -217,7 +217,7 @@ clone_user_rev() {
             fi;;
     esac
 
-    echo "git revision is $(cd $dir && git rev-parse $rev)"
+    echo "git revision is $(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)"
 
     # Allow doing additional processing before .git removal
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"