Merge branch 'master' of git://git.netsurf-browser.org/netsurf
This commit is contained in:
commit
b5f7847816
|
@ -68,7 +68,7 @@ if ( $git_present ) {
|
||||||
chomp $gitinfo{url};
|
chomp $gitinfo{url};
|
||||||
$gitinfo{revision} = `git rev-parse HEAD`;
|
$gitinfo{revision} = `git rev-parse HEAD`;
|
||||||
chomp $gitinfo{revision};
|
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};
|
chomp $gitinfo{branch};
|
||||||
@bits = split /\s+/, `git describe --tags --exact-match HEAD 2>/dev/null`;
|
@bits = split /\s+/, `git describe --tags --exact-match HEAD 2>/dev/null`;
|
||||||
$bits[0] = "" unless exists $bits[0];
|
$bits[0] = "" unless exists $bits[0];
|
||||||
|
|
Loading…
Reference in New Issue