diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-07-15 13:56:33 +0100 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-07-15 13:56:33 +0100 |
commit | 98e2b3f4df0475987c271e66b84862dcc410b95f (patch) | |
tree | 6ea01a7ea590175c0c563dc11f91a4572f5403b3 /utils/git-testament.pl | |
parent | 1ecc94b187a94859fb347cd5f585d721e7d6e8be (diff) | |
download | netsurf-98e2b3f4df0475987c271e66b84862dcc410b95f.tar.gz netsurf-98e2b3f4df0475987c271e66b84862dcc410b95f.tar.bz2 |
git-testament: Cope with detached HEAD better
Diffstat (limited to 'utils/git-testament.pl')
-rw-r--r-- | utils/git-testament.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/git-testament.pl b/utils/git-testament.pl index dc6301b50..89c41ab5e 100644 --- a/utils/git-testament.pl +++ b/utils/git-testament.pl @@ -68,7 +68,7 @@ if ( $git_present ) { chomp $gitinfo{url}; $gitinfo{revision} = `git rev-parse HEAD`; chomp $gitinfo{revision}; - $gitinfo{branch} = `git for-each-ref --format="\%(refname:short)" \$(git symbolic-ref HEAD)`; + $gitinfo{branch} = `git for-each-ref --format="\%(refname:short)" \$(git symbolic-ref HEAD 2>/dev/null || git show-ref -s HEAD)`; chomp $gitinfo{branch}; @bits = split /\s+/, `git describe --tags --exact-match HEAD 2>/dev/null`; $bits[0] = "" unless exists $bits[0]; |