git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org, "J.H." <warthog9@kernel.org>,
	"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: Issue with gitweb + tag + branch of the same name from master branch commit
Date: Sat, 22 Aug 2009 13:12:51 -0700	[thread overview]
Message-ID: <1250971971.26147.122.camel@haakon2.linux-iscsi.org> (raw)
In-Reply-To: <m3fxbkn5ot.fsf@localhost.localdomain>

Greetings Jakub,

On Fri, 2009-08-21 at 15:49 -0700, Jakub Narebski wrote:
> "Nicholas A. Bellinger" <nab@linux-iscsi.org> 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?
> 

I stumbled the strangeness in k.o gitweb due to my inexperience with git
tagging+branch..  I absoulutely agree that it makes more sense to use
different names for these, and that is what I am doing from now on.. :-)

> > 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?

That is correct..

>  
> > 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 elsewhere
> 
> This 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'.
>

Cool, I am hear it has already been fixed.

--nab

      reply	other threads:[~2009-08-22 20:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-20 23:30 Issue with gitweb + tag + branch of the same name from master branch commit Nicholas A. Bellinger
2009-08-21  0:19 ` Junio C Hamano
2009-08-21 22:49 ` Jakub Narebski
2009-08-22 20:12   ` Nicholas A. Bellinger [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1250971971.26147.122.camel@haakon2.linux-iscsi.org \
    --to=nab@linux-iscsi.org \
    --cc=git@vger.kernel.org \
    --cc=hpa@zytor.com \
    --cc=jnareb@gmail.com \
    --cc=warthog9@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).