fix git describe for 2009 vintage git!

diff --git a/Changes b/Changes
index a883fa661552b46163e23a2b3d415e02ee9bb1da..c2d65cd82dcdc8b0369b172bd17e99a0f70084d3 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+12Dec21=======================================================================
+1. fix git describe et al AGAIN to cope with (very) old (2009) git versions.

 11Dec21=======================================================================
 1. Removed dependency on perl Git package.
 2. Fixed errors caused by change 1 (use git -C $root to force .git location).
 11Dec21=======================================================================
 1. Removed dependency on perl Git package.
 2. Fixed errors caused by change 1 (use git -C $root to force .git location).

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 7436c874dfed6770c9add6812d71cfd49ee38959..b544d7de26c47a321852b9be2d13611b1a309ea9 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -407,7 +407,7 @@ if (DXSql::init($dsn)) {
 
        # determine the real Git build number and branch
        my $desc;
 
        # determine the real Git build number and branch
        my $desc;

-       eval {$desc = `git -C $root describe --long`};
+       eval {$desc = `git --git-dir=$root/.git describe --long`};

        if (!$@ && $desc) {
                my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
                $version = $v;
        if (!$@ && $desc) {
                my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
                $version = $v;


@@ -418,7 +418,7 @@ if (DXSql::init($dsn)) {
     if (!$@) {
                my @branch;
                
     if (!$@) {
                my @branch;
                

-               eval {@branch = `git -C $root branch`};
+               eval {@branch = `git --git-dir=$root/.git branch`};

                unless ($@) {
                        for (@branch) {
                                my ($star, $b) = split /\s+/;
                unless ($@) {
                        for (@branch) {
                                my ($star, $b) = split /\s+/;