[ https://issues.apache.org/jira/browse/CASSANDRA-17997?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17631188#comment-17631188 ]
Andres de la Peña commented on CASSANDRA-17997: ----------------------------------------------- Changes look good to me, I have left only a remaining nit on the PR. I have tested the script manually and verified that the specified branch is picked, the default is correct and it complains if the branch is not found. I'm not actually running CI because all this does is generating the config file according to the base branch. One can just see the changed files locally and I can't imagine what pushing the config to Circle would probe. I think now we'll need the approval of a second committer and patches for 3.0, 4.0, 4.1 and trunk. > Improve git branch handling for CircleCI generate.sh > ---------------------------------------------------- > > Key: CASSANDRA-17997 > URL: https://issues.apache.org/jira/browse/CASSANDRA-17997 > Project: Cassandra > Issue Type: Improvement > Components: CI > Reporter: Derek Chen-Becker > Assignee: Derek Chen-Becker > Priority: Normal > > 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. -- This message was sent by Atlassian Jira (v8.20.10#820010) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org