Re: Issue with gitweb + tag + branch of the same name from master branch commit
From: Jakub Narebski <hidden>
Date: 2016-06-15 22:47:17
"Nicholas A. Bellinger" [off-list ref] writes:
I have recently been trying to make a tag and branch of the same name
But why? Why do you want to confuse git and yourself?
from a previous <COMMIT> on a master branch on a kernel.org tree using
the following commands:
# Create the tag:
git tag -a lio-x.y <COMMIT>
# Push the tags:
git push --tags origin
# Fetch to be sure
git fetch origin
# Make tagged branch:
git checkout -b lio-x.y <COMMIT>
# Make <NEW_COMMIT> to lio-x.y and commit
git commit frob
# Switch back to master branch
git checkout master
# Push local branch to origin
git push origin refs/heads/lio-x.y
At this point after pushing to origin, I can do a fresh clone of the
tree, and do a 'git checkout origin/lio-x.y and I see '<NEW_COMMIT>',
and the logs and blobs look as expected..
However, after checking gitweb log for branch lio-x.y on kernel.org, I
only see <COMMIT>, and not <NEW_COMMIT>, and all of the blobs in branch
lio-x.y still reference the original <COMMIT>, et al.I guess that you meant here gitweb's 'log' / 'shortlog' view linked from 'heads' view, don't you?
John Hawley has been helping to resolve the issue (I am just going to use different tag/branch names instead), and hpa asked me to report this as it is easy to reproduce with the gitweb version on kernel.org..
22:42 < warthog9> I would got show this to the git people, it *could*
just be an old bug in gitweb (ours is not particularly
up to date) but if I can replicate it here easily enough
I'm guessing there's still a bug elsewhereThis is an old and long fixed (or rather worked around) issue in gitweb, fixed in bf901f8 (gitweb: disambiguate heads and tags withs the same name, 2007-12-15)... well if by fixed you can consider passing around "fully qualified" refnames, i.e. the 'shortlog' link in 'heads' view now uses 'refs/heads/frob', and not only 'frob'. J.H., you might want to consider cherry-picking this... unless you have done that, or independently fixed this issue. -- Jakub Narebski Poland ShadeHawk on #git