Detected while doing a local review of:
We now have:
This shows up here:
❯ git show-ref | grep v2.2
c31529878e384560e61f862130fca64e43e09013 refs/heads/v2.2
c31529878e384560e61f862130fca64e43e09013 refs/remotes/origin/v2.2
98c16215e3cecc9f2d33f79b5b979d8c79c2ba96 refs/tags/v2.2
This means that one needs to be careful when doing diff locally.
On my machine, for instance, this command will by default compare to the tag, not the branch (which is problematic when reviewing PR #204 to be merged into v2.2 branch):
git diff -M --name-status v2.2...HEAD
warning: refname 'v2.2' is ambiguous.
A CHANGELOG.md
A README.md
D docs/README.md
M xsd/siri_utility/siri_types.xsd
(git rev-parse v2.2 shows how it resolves)
It can be solved by using explicit ref type (origin/v2.2 instead of just v2.2 which resolves to the tag in my case):
❯ git diff -M -w origin/v2.2...HEAD --name-status
A CHANGELOG.md
A README.md
D docs/README.md
Ultimately: we need to ensure we use different formatting (e.g. v2.2.x) for releases versus tags, so that there is no conflict which will cause issues down the road.
Detected while doing a local review of:
We now have:
v2.2means release https://github.com/SIRI-CEN/SIRI/releases/tag/v2.2v2.2means https://github.com/SIRI-CEN/SIRI/tree/v2.2 thev2.2release branchThis shows up here:
This means that one needs to be careful when doing diff locally.
On my machine, for instance, this command will by default compare to the tag, not the branch (which is problematic when reviewing PR #204 to be merged into
v2.2branch):(
git rev-parse v2.2shows how it resolves)It can be solved by using explicit ref type (
origin/v2.2instead of justv2.2which resolves to the tag in my case):Ultimately: we need to ensure we use different formatting (e.g.
v2.2.x) for releases versus tags, so that there is no conflict which will cause issues down the road.