[CASSANDRA-17997] Improve git branch handling for CircleCI generate.sh

• Type: Improvement
• Status: Resolved
• Priority: Normal
• Resolution: Fixed
• Fix Version/s: 3.0.30, 3.11.16, 4.0.11, 4.1.3, 5.0-alpha1, 5.0
• Component/s: CI
• Epic Link: circleci_improvements
• Change Category: Quality Assurance
• Complexity: Normal
• Platform: All

Source Control Link

https://github.com/apache/cassandra/commit/8d3c30dde4b615835073089594003ca40a730992

Test and Documentation Plan

The script should be manually tested with different base branches, existing and not-existing, using the default branch and a manually specified one.

• Assignee: Derek Chen-Becker Assign to me
• Reporter: Derek Chen-Becker

Authors

Derek Chen-Becker

Reviewers

Andres de la Peña, Berenguer Blasi

• Created: 26/Oct/22 21:22
• Updated: 12/Sep/23 16:02
• Resolved: 07/Jun/23 13:17

Description

The generate.sh script assumes a base git branch that is local and named after the official repo branch (e.g. `cassandra-3.11`). This may not be a local branch if the developer has recently cloned the repo and is creating a work branch, and will lead to the git commands in generate.sh failing:

 

```

fatal: ambiguous argument 'cassandra-3.11...HEAD': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] – [<file>...]'

```

We should be able to make some sanity checks to better guide or warn the developer if things aren't set up properly to check against git.

Issue Links

• is related to: CASSANDRA-17939 CircleCI: Automatically detect and repeat new or modified JUnit tests