From: Junio C Hamano <gitster@pobox.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: git@vger.kernel.org, Simon Braunschmidt <sb@emlix.com>
Subject: Re: [PATCH] Fix behavior with non-committish upstream references
Date: Tue, 28 Apr 2009 00:30:05 -0700 [thread overview]
Message-ID: <7vab61s0aq.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1240849603-26127-1-git-send-email-git@drmicha.warpmail.net> (Michael J. Gruber's message of "Mon, 27 Apr 2009 18:26:43 +0200")
Michael J Gruber <git@drmicha.warpmail.net> writes:
> stat_tracking_info() assumes that upstream references (as specified by
> --track or set up automatically) are commits. By calling lookup_commit()
> on them, create_objects() creates objects for them with type commit no
> matter what their real type is; this disturbs lookup_tag() later on the
> call sequence, leading to git status, git branch -v and git checkout
> erroring out.
>
> Fix this by using lookup_commit_reference() instead so that (annotated)
> tags can be used as upstream references.
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
> I'm sorry I won't be able to write a test any more today. Please let me
> whether it's okay without a test.
I am sorry, but I simply do not see much point in this. I think you meant
by the title "non-commit upstream ref", as a tag that eventually peels to
a commit is a committish. Because a tag is meant to be immutable, forking
from that mean your further "merges from upstream" won't do anything, so
the current behaviour of returning without saying anything sounds like the
right thing to do, even though I strongly suspect that it behaves this way
by accident not by design.
Admittedly, I do not "fork and keep up-to-date with an upstream" that
often, so I am in no way making a final decision here. It would be
healthy for interested people to discuss this patch, but I'd appreciate it
if it happens after 1.6.3 final.
next prev parent reply other threads:[~2009-04-28 7:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-23 9:52 tracking branch on a tag Simon Braunschmidt
2009-04-27 16:26 ` [PATCH] Fix behavior with non-committish upstream references Michael J Gruber
2009-04-28 7:30 ` Junio C Hamano [this message]
2009-04-28 7:44 ` Michael J Gruber
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=7vab61s0aq.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=sb@emlix.com \
/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).