From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Subject: Re: [PATCH 4/5] make get_short_ref a public function
Date: Thu, 9 Apr 2009 11:05:06 +0200 [thread overview]
Message-ID: <36ca99e90904090205g8a6a5a6nea96f8c5f44e076a@mail.gmail.com> (raw)
In-Reply-To: <20090409081857.GC17221@coredump.intra.peff.net>
On Thu, Apr 9, 2009 at 10:18, Jeff King <peff@peff.net> wrote:
> On Tue, Apr 07, 2009 at 09:39:58AM +0200, Bert Wesarg wrote:
>
>> > Actually, I am not quite sure that this function is "more correct". It
>> > looks at the rev-parsing rules as a hierarchy, so if you have
>> > "refs/remotes/foo" and "refs/heads/foo", then it will abbreviate the
>> > first to "remotes/foo" (as expected) and the latter to just "foo".
>> >
>> > This is technically correct, as "refs/heads/foo" will be selected by
>> > "foo", but it will warn about ambiguity. Should we actually try to avoid
>> > reporting refs which would be ambiguous?
>> Back than, there was the idea that the core.warnAmbiguousRefs config
>> could be used for this.
>
> I'm not quite sure what you mean. Using this function, we may shorten an
> unambiguous name to one that will complain if core.warnAmbiguousRefs is
> set. So what I'm wondering is if it should use a different algorithm
> that produces a shortened ref which will not cause a warning.
>
> E.g., right now if we have:
>
> refs/heads/master
> refs/remotes/master
>
> showing %(refname:short) gets you:
>
> master
> remotes/master
>
> but "git show master" will warn about the ambiguous ref (but still show
> you the one you want). An alternative would be to show:
>
> heads/master
> remotes/master
>
> in this case.
Right, and the idea was to choose the alternatives based on the
core.warnAmbiguousRefs setting, i.e. the former for false, the latter
for true.
For what I posted a patch some time ago:
http://thread.gmane.org/gmane.comp.version-control.git/96464
(which I read though now)
Bert
>
> -Peff
>
next prev parent reply other threads:[~2009-04-09 9:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-07 7:02 [RFC/PATCH 0/5] making upstream branch information accessible Jeff King
2009-04-07 7:05 ` [PATCH 1/5] for-each-ref: refactor get_short_ref function Jeff King
2009-04-07 7:06 ` [PATCH 2/5] for-each-ref: refactor refname handling Jeff King
2009-04-08 6:22 ` Junio C Hamano
2009-04-08 6:27 ` Jeff King
2009-04-07 7:09 ` [PATCH 3/5] for-each-ref: add "upstream" format field Jeff King
2009-04-07 7:14 ` [PATCH 4/5] make get_short_ref a public function Jeff King
2009-04-07 7:39 ` Bert Wesarg
2009-04-09 8:18 ` Jeff King
2009-04-09 9:05 ` Bert Wesarg [this message]
2009-04-11 17:14 ` [PATCH&RFC] get_short_ref(): add strict mode Bert Wesarg
2009-04-11 19:23 ` Junio C Hamano
2009-04-11 19:50 ` Bert Wesarg
2009-04-11 20:35 ` [PATCH] for-each-ref: refname:short utilize core.warnAmbiguousRefs Bert Wesarg
2009-04-13 8:15 ` [PATCH 4/5] make get_short_ref a public function Jeff King
2009-04-07 7:57 ` Michael J Gruber
2009-04-07 7:16 ` [PATCH 5/5] branch: show upstream branch when double verbose Jeff King
2009-04-07 8:02 ` Michael J Gruber
2009-04-09 8:23 ` Jeff King
2009-04-09 10:15 ` Santi Béjar
2009-04-13 8:34 ` Jeff King
2009-04-13 17:04 ` Wincent Colaiuta
2009-04-07 8:12 ` Paolo Ciarrocchi
2009-04-07 7:33 ` [PATCH] for-each-ref: remove multiple xstrdup() in get_short_ref() Bert Wesarg
2009-04-07 7:44 ` Jeff King
2009-04-07 7:54 ` Bert Wesarg
2009-04-07 21:41 ` Jeff King
2009-04-07 7:44 ` Bert Wesarg
-- strict thread matches above, loose matches on Subject: below --
2008-09-22 9:09 [PATCH 1/3] for-each-ref: utilize core.warnambiguousrefs for strict refname:short format Bert Wesarg
2008-09-22 9:09 ` [PATCH 2/3] for-each-ref: factor out get_short_ref() into refs.c:abbreviate_refname() Bert Wesarg
2008-09-22 9:09 ` [PATCH 3/3] git abbref-ref: new porcelain for abbreviate_ref() Bert Wesarg
2008-09-22 15:32 ` Shawn O. Pearce
2008-09-22 15:55 ` Junio C Hamano
2008-09-22 16:45 ` Bert Wesarg
2008-09-22 16:43 ` Bert Wesarg
2008-09-22 16:27 ` [PATCH 1/3] for-each-ref: utilize core.warnambiguousrefs for strict refname:short format Junio C Hamano
2008-09-22 18:00 ` Bert Wesarg
2008-10-17 23:58 ` Junio C Hamano
2008-10-18 1:50 ` Shawn O. Pearce
2008-10-18 6:55 ` Bert Wesarg
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=36ca99e90904090205g8a6a5a6nea96f8c5f44e076a@mail.gmail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=paolo.ciarrocchi@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).