diff options
| author | Ole Loots <ole@monochrom.net> | 2012-07-23 00:00:09 +0200 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2012-07-23 00:00:09 +0200 |
| commit | dabc915ec937f69ec47a25389032fcdca9e8000b (patch) | |
| tree | b5c136866c77160047b06467f08cc4321cf93521 /utils/git-testament.pl | |
| parent | 00ffa9e12ccee60d42243a925481d24322975366 (diff) | |
| parent | 3c790bf12dc6def3ede8d4fd4d7739a5dfadf01f (diff) | |
| download | netsurf-dabc915ec937f69ec47a25389032fcdca9e8000b.tar.gz netsurf-dabc915ec937f69ec47a25389032fcdca9e8000b.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
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]; |