ninja-fix nested cassandra clone for dtest jar building re-use check

(git -C … will fall back to parent level .git repo, confusing the check)

patch by Mick Semb Wever; reviewed by Štefan Miklošovič for CASSANDRA-18936,CASSANDRA-18665
This commit is contained in:
Stefan Miklosovic 2023-10-19 21:34:30 +02:00
parent 07df26778b
commit e2d2bd61f4
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
1 changed files with 1 additions and 1 deletions

View File

@ -86,7 +86,7 @@ _build_all_dtest_jars() {
cp "${TMP_DIR}/cassandra-dtest-jars/build/dtest-${dtest_jar_version}.jar" ${DIST_DIR}/
fi
if [ -d ${TMP_DIR}/cassandra-dtest-jars ] && [ "https://github.com/apache/cassandra.git" == "$(git -C ${TMP_DIR}/cassandra-dtest-jars remote get-url origin)" ] ; then
if [ -d ${TMP_DIR}/cassandra-dtest-jars/.git ] && [ "https://github.com/apache/cassandra.git" == "$(git -C ${TMP_DIR}/cassandra-dtest-jars remote get-url origin)" ] ; then
echo "Reusing ${TMP_DIR}/cassandra-dtest-jars for past branch dtest jars"
if [ "x" == "x${OFFLINE}" ] ; then
until git -C ${TMP_DIR}/cassandra-dtest-jars fetch --quiet origin ; do echo "git -C ${TMP_DIR}/cassandra-dtest-jars fetch failed… trying again… " ; done