From: Dirk Koopman <djk@tobit.co.uk>
Date: Sat, 11 Dec 2021 19:26:14 +0000 (+0000)
Subject: force repo to use on git -C $root describe
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=daaad9dda3a184f2b3ecd23891eda101995d036f;p=spider.git

force repo to use on git -C $root describe
---

diff --git a/Changes b/Changes
index 44ac206c..a139b629 100644
--- 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 db05800f..c04f1dbd 100755
--- 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+/;