force repo to use on git -C $root describe

diff --git a/Changes b/Changes
index 44ac206ccebbf98fb63082a16d54153bd1c6ff57..a139b629418bb421964f7107467c1573c2aab8c6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 11Dec21=======================================================================
 1. Removed dependency on perl Git package.
-2. Force code to change directory to $DXSPIDER_ROOT || '/spider'.
+2. Force code to change directory to $DXSPIDER_ROOT || '/spider'. Also force
+   git -C $root describe.
 10Dec21=======================================================================
 1. Fix the output of set/dxgrid, set/usstate and set/dxcq or set/dxitu to how
    it was always supposed to be since 2003.

diff --git a/perl/cluster.pl b/perl/cluster.pl
index db05800f9c305216aa06bcec7e707930ffb71c96..c04f1dbdc4ec4848902b4525422a0ea4b33d52d0 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -522,7 +522,7 @@ sub setup_start
                
                # determine the real Git build number and branch
                my $desc;
-               eval {$desc = `git describe --long`};
+               eval {$desc = `git -C $root describe --long`};
                if (!$@ && $desc) {
                        my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
                        $version = $v;
@@ -533,7 +533,7 @@ sub setup_start
                if (!$@) {
                        my @branch;
                        
-                       eval {@branch = `git branch`};
+                       eval {@branch = `git -C $root branch`};
                        unless ($@) {
                                for (@branch) {
                                        my ($star, $b) = split /\s+/;