diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2012-07-15 14:25:07 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-07-15 14:25:07 +0100 |
| commit | b5f784781617ce5693c9c7d373d857acbd190018 (patch) | |
| tree | cc8df67a710e80e563c4c7afb3c2dd56d5dbf527 | |
| parent | f266e0569e954e68429c9ee4646275e904463d9a (diff) | |
| parent | 98e2b3f4df0475987c271e66b84862dcc410b95f (diff) | |
| download | netsurf-b5f784781617ce5693c9c7d373d857acbd190018.tar.gz netsurf-b5f784781617ce5693c9c7d373d857acbd190018.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
| -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]; |