[cmake] Clone the corresponding roottest branch, if latest-stable has been checked out for root#9025
Merged
jalopezg-git merged 2 commits intoroot-project:masterfrom Sep 26, 2021
Conversation
…-stable If the current checked out branch is `latest-stable`, resolve it to the latest merged head/tag (i.e. latest-stable^2), and use that to clone `roottest`, e.g. ``` $ git for-each-ref --points-at=latest-stable^2 --format=%(refname:short) v6-24-06 $ git clone -b v6-24-06 https://github.com/root-project/roottest.git ``` Closes issue root-project#8783.
If the checked out ref in `root` is a tag, `roottest` is not cloned at the expected revision, i.e. current implementation only works for heads. This commit fixes the issue.
jalopezg-git
requested review from
Axel-Naumann,
amadio,
bellenot,
eguiraud and
hahnjo
|
Starting build on |
|
Build failed on mac11.0/cxx17. Failing tests: |
|
Build failed on windows10/cxx14. Failing tests: |
Contributor
Author
|
@phsft-bot build just on windows10/cxx14 |
|
Starting build on |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull-request fixes a couple of issues related to
roottestbranch sync'ing. See issue #8783 for more information.Changes or fixes:
roottesthead/tag if root is atlatest-stable. If the current checked out branch islatest-stable, resolve it to the latest merged head/tag (i.e. second parent of latest-stable), and use that to cloneroottest. These two commands illustrate the proposed behavior:rootis a tag (e.g. as a result of$ git checkout v6-24-06),roottestis not cloned at the expected revision. The previous implementation relied ongit rev-parse --abbrev-ref HEADto get the name of the checked out branch. While this works for branch heads, it fails for tags, i.e.$ git checkout v6-24-06 HEAD is now at 3b796f86a3 "Update ROOT version files to v6.24/06." $ git rev-parse --abbrev-ref HEAD HEADThe proposed solution in this case is to use
git for-each-ref(or alternativelygit describe), i.e.$ git for-each-ref --points-at=HEAD --format='%(refname:short)' v6-24-06Checklist:
This PR fixes #8783.