From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Duy Nguyen <pclouds@gmail.com>
Subject: Re: [PATCH 4/5] remote.c: teach branch_get() to treat symrefs other than HEAD
Date: Thu, 2 May 2013 00:14:44 +0530 [thread overview]
Message-ID: <CALkWK0n2odCn=GnYSXv7g113PFEX42WF1d2GBGV=ye2TuY3CHA@mail.gmail.com> (raw)
In-Reply-To: <CAMP44s20F-QALd18VPHLF4Fj=eFFvXmkhC4XK__kxNhMoeN=ug@mail.gmail.com>
Felipe Contreras wrote:
> But why? I'm not familiar with branch_get, but my intuition tells me
> you are changing the behavior, and now branch_get() is doing something
> it wasn't intended to do. And for what?
Why is there a commit message? I've explained what the behavior change is.
> Your rationale is that it fixes the test cases below, but that's not
> reason enough, since there are other ways to fix them, as my patch
> series shows.
For what exactly. To fix a real bug: H@{u} and @@{u} don't work where
either H or @ are symbolic refs. I want custom symbolic refs, because
they are useful. In other words, "HEAD" is not a sacred symbolic ref.
>> if (ret && ret->remote_name) {
>> ret->remote = remote_get(ret->remote_name);
>> if (ret->merge_nr) {
>> diff --git a/sha1_name.c b/sha1_name.c
>> index f30e344..c4a3a54 100644
>> --- a/sha1_name.c
>> +++ b/sha1_name.c
>> @@ -1060,7 +1060,7 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
>> return ret - used + len;
>> }
>>
>> - cp = strchr(name, '@');
>> + cp = strstr(name, "@{");
>
> This might make sense, but it feels totally sneaked in.
Sneaked in? I have three paragraphs in my commit message. The first
two explain two related changes, and the third one shows how they are
related.
>> if (!cp)
>> return -1;
>> tmp_len = upstream_mark(cp, namelen - (cp - name));
>
> I think these are two patches should be introduced separately, and
> with a reason for them to exist independent of each other.
I cannot justify the remote.c patch without the "@{" change.
next prev parent reply other threads:[~2013-05-01 18:45 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-01 16:20 [PATCH 0/5] A natural solution to the @ -> HEAD problem Ramkumar Ramachandra
2013-05-01 16:20 ` [PATCH 1/5] t1508 (at-combinations): more tests; document failures Ramkumar Ramachandra
2013-05-01 18:53 ` Junio C Hamano
2013-05-01 21:04 ` Ramkumar Ramachandra
2013-05-01 21:16 ` Jeff King
2013-05-01 22:01 ` Ramkumar Ramachandra
2013-05-01 22:54 ` Junio C Hamano
2013-05-02 2:22 ` Felipe Contreras
2013-05-02 9:07 ` Ramkumar Ramachandra
2013-05-02 9:45 ` Felipe Contreras
2013-05-02 11:03 ` Ramkumar Ramachandra
2013-05-02 11:36 ` Ramkumar Ramachandra
2013-05-02 16:45 ` Felipe Contreras
2013-05-02 16:56 ` Ramkumar Ramachandra
2013-05-02 17:01 ` Felipe Contreras
2013-05-02 17:02 ` Ramkumar Ramachandra
2013-05-02 17:08 ` Felipe Contreras
2013-05-02 17:09 ` Ramkumar Ramachandra
2013-05-04 8:10 ` David Aguilar
2013-05-04 8:16 ` David Aguilar
2013-05-01 16:20 ` [PATCH 2/5] sha1_name.c: don't waste cycles in the @-parsing loop Ramkumar Ramachandra
2013-05-01 17:57 ` Felipe Contreras
2013-05-01 18:48 ` Ramkumar Ramachandra
2013-05-02 0:04 ` Junio C Hamano
2013-05-01 16:20 ` [PATCH 3/5] sha1_name.c: simplify @-parsing in get_sha1_basic() Ramkumar Ramachandra
2013-05-01 18:09 ` Felipe Contreras
2013-05-01 18:36 ` Ramkumar Ramachandra
2013-05-01 18:54 ` Jonathan Nieder
2013-05-01 19:55 ` Ramkumar Ramachandra
2013-05-01 19:23 ` Felipe Contreras
2013-05-01 19:40 ` Ramkumar Ramachandra
2013-05-01 22:18 ` Felipe Contreras
2013-05-01 22:26 ` Ramkumar Ramachandra
2013-05-01 22:39 ` Felipe Contreras
2013-05-01 22:06 ` Ramkumar Ramachandra
2013-05-01 16:20 ` [PATCH 4/5] remote.c: teach branch_get() to treat symrefs other than HEAD Ramkumar Ramachandra
2013-05-01 18:16 ` Felipe Contreras
2013-05-01 18:44 ` Ramkumar Ramachandra [this message]
2013-05-01 19:28 ` Felipe Contreras
2013-05-01 19:50 ` Ramkumar Ramachandra
2013-05-01 20:48 ` Felipe Contreras
2013-05-01 20:57 ` Ramkumar Ramachandra
2013-05-01 22:23 ` Felipe Contreras
2013-05-01 16:20 ` [PATCH 5/5] refs.c: make @ a pseudo-ref alias to HEAD Ramkumar Ramachandra
2013-05-01 18:20 ` Felipe Contreras
2013-05-01 19:00 ` Ramkumar Ramachandra
2013-05-01 19:31 ` Felipe Contreras
2013-05-01 19:51 ` Ramkumar Ramachandra
2013-05-01 21:49 ` [PATCH 0/5] A natural solution to the @ -> HEAD problem Ramkumar Ramachandra
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='CALkWK0n2odCn=GnYSXv7g113PFEX42WF1d2GBGV=ye2TuY3CHA@mail.gmail.com' \
--to=artagnon@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).