From: Sverre Rabbelier <srabbelier@gmail.com>
To: Johan Herland <johan@herland.net>
Cc: git@vger.kernel.org, jrnieder@gmail.com, bebarino@gmail.com,
avarab@gmail.com, gitster@pobox.com
Subject: Re: [PATCHv4 00/21] git notes merge
Date: Fri, 22 Oct 2010 18:44:37 -0700 [thread overview]
Message-ID: <AANLkTi=KC1fc35xygbQXJ_pmmdy4ePS-zWwfoDLN4_Ao@mail.gmail.com> (raw)
In-Reply-To: <201010230247.45097.johan@herland.net>
Heya,
On Fri, Oct 22, 2010 at 17:47, Johan Herland <johan@herland.net> wrote:
> On Friday 22 October 2010, Sverre Rabbelier wrote:
>> I think notes directly under /refs/notes/ should be shared by default,
>> but those in sub-refs (such as the /refs/notes/am/ that's been
>> mentioned before) should not.
>
> In theory that would make sense, but how you write that as a refspec? AFAIK,
> refspecs don't (yet) support a syntax for (a) _excluding_ something from a
> glob, and certainly not (b) excluding all "sub-refs" from a glob.
Indeed, which I think is a shame. For that matter, I'd love to be able
to have negative globs for branches in general (e.g., 'git log
--branches :-heads/hidden/**).
> Alternatively, we could share everything under refs/notes/, except
> /refs/notes/local/ (or refs/notes/private/ or whatever). That would just
> require support for (a)...
That goes against how notes are used though. The refs/notes/* space is
the one that is shown by default, not refs/notes/local/*.
>> Who's going to type that out though? The only use case I can think of
>> is if you want to be able to give someone a line they can paste and be
>> set right away, but I don't see why in that case pasting multiple
>> commands (i.e., calling 'git config' a few times) wouldn't suffice.
>
> You might be right. I was thinking that before we provide shorthands, we
> should provide an option that let you specify _any_ refspec. Sort of as a
> fallback if somebody's scenario doesn't fit into any of the shorthands.
>
> But as you say, this can also be done with a few calls to git config.
[...]
>> Adding refspec shorthands _does_ make sense. However, it might make
>> more sense to put those under 'git remote' instead?
>
> I'd say _both_ 'git remote' and 'git clone'.
I think getting those shorthands in git config/git remote is step one,
if we do want that. Then, if desired, we can add that to git clone.
>> That sounds like a good use case.
>
> But I believe we need to extend the refspec syntax to support at least (a)
> from above (excluding named entries from a refspec glob) in order to support
> hiding of certain refs. Still, I think it would be a useful addition.
Agreed.
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2010-10-23 1:52 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-21 2:08 [PATCHv4 00/21] git notes merge Johan Herland
2010-10-21 2:08 ` [PATCHv4 01/21] notes.c: Hexify SHA1 in die() message from init_notes() Johan Herland
2010-10-21 2:08 ` [PATCHv4 02/21] (trivial) notes.h: Minor documentation fixes to copy_notes() Johan Herland
2010-10-21 2:08 ` [PATCHv4 03/21] notes.h: Make default_notes_ref() available in notes API Johan Herland
2010-10-21 2:08 ` [PATCHv4 04/21] notes.c: Reorder functions in preparation for next commit Johan Herland
2010-10-21 2:08 ` [PATCHv4 05/21] notes.h/c: Clarify the handling of notes objects that are == null_sha1 Johan Herland
2010-10-21 5:12 ` Jonathan Nieder
2010-10-21 13:13 ` Johan Herland
2010-10-21 17:54 ` Jonathan Nieder
2010-10-22 13:32 ` Johan Herland
2010-10-21 2:08 ` [PATCHv4 06/21] notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond Johan Herland
2010-10-21 5:21 ` Jonathan Nieder
2010-10-21 13:16 ` Johan Herland
2010-10-21 2:08 ` [PATCHv4 07/21] (trivial) t3303: Indent with tabs instead of spaces for consistency Johan Herland
2010-10-21 2:08 ` [PATCHv4 08/21] notes.c: Use two newlines (instead of one) when concatenating notes Johan Herland
2010-10-21 2:08 ` [PATCHv4 09/21] builtin/notes.c: Split notes ref DWIMmery into a separate function Johan Herland
2010-10-21 2:08 ` [PATCHv4 10/21] git notes merge: Initial implementation handling trivial merges only Johan Herland
2010-10-21 2:08 ` [PATCHv4 11/21] builtin/notes.c: Refactor creation of notes commits Johan Herland
2010-10-21 2:08 ` [PATCHv4 12/21] git notes merge: Handle real, non-conflicting notes merges Johan Herland
2010-10-21 2:08 ` [PATCHv4 13/21] git notes merge: Add automatic conflict resolvers (ours, theirs, union) Johan Herland
2010-10-21 2:08 ` [PATCHv4 14/21] Documentation: Preliminary docs on 'git notes merge' Johan Herland
2010-10-21 2:08 ` [PATCHv4 15/21] git notes merge: Manual conflict resolution, part 1/2 Johan Herland
2010-10-21 2:08 ` [PATCHv4 16/21] git notes merge: Manual conflict resolution, part 2/2 Johan Herland
2010-10-21 2:08 ` [PATCHv4 17/21] git notes merge: List conflicting notes in notes merge commit message Johan Herland
2010-10-21 2:08 ` [PATCHv4 18/21] git notes merge: --commit should fail if underlying notes ref has moved Johan Herland
2010-10-21 2:08 ` [PATCHv4 19/21] git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" Johan Herland
2010-10-21 2:08 ` [PATCHv4 20/21] git notes merge: Add testcases for merging notes trees at different fanouts Johan Herland
2010-10-21 2:08 ` [PATCHv4 21/21] Provide 'git notes get-ref' to easily retrieve current notes ref Johan Herland
2010-10-21 21:00 ` [PATCHv4 00/21] git notes merge Sverre Rabbelier
2010-10-21 23:20 ` Junio C Hamano
2010-10-21 23:30 ` Jonathan Nieder
2010-10-22 14:11 ` git merge --abort? [was: Re: [PATCHv4 00/21] git notes merge] Johan Herland
2010-10-22 14:55 ` Jonathan Nieder
2010-10-22 15:12 ` Johan Herland
2010-10-22 15:20 ` Sverre Rabbelier
2010-10-22 15:48 ` Jonathan Nieder
2010-10-22 15:57 ` Sverre Rabbelier
2010-10-22 15:41 ` [PATCHv4 00/21] git notes merge Johan Herland
2010-10-22 15:54 ` Sverre Rabbelier
2010-10-23 0:47 ` Johan Herland
2010-10-23 1:44 ` Sverre Rabbelier [this message]
2010-10-22 22:28 ` Johan Herland
2010-10-23 1:38 ` Sverre Rabbelier
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='AANLkTi=KC1fc35xygbQXJ_pmmdy4ePS-zWwfoDLN4_Ao@mail.gmail.com' \
--to=srabbelier@gmail.com \
--cc=avarab@gmail.com \
--cc=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johan@herland.net \
--cc=jrnieder@gmail.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).