All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>,
	Git List <git@vger.kernel.org>, Johan Herland <johan@herland.net>,
	Michael Haggerty <mhagger@alum.mit.edu>,
	Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v7 4/4] notes: teach git-notes about notes.<ref>.mergestrategy option
Date: Mon, 17 Aug 2015 10:22:47 -0700	[thread overview]
Message-ID: <xmqqpp2lesns.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CA+P7+xqHzE5b7_yEqnCDq_vVJGSnsHPV8qJrXqUAGW=h_5C0mQ@mail.gmail.com> (Jacob Keller's message of "Fri, 14 Aug 2015 15:48:54 -0700")

Jacob Keller <jacob.keller@gmail.com> writes:

>> Sorry, but I lost track.
>>
>> Do I understand correctly the consensus on the previous discussion?
>> My understanding is:
>>
>>  (1) We do not currently refuse to merge notes into anywhere outside
>>      of refs/notes/;
>
> We do. I mis understood the original code. We check inside
> "init_notes_check()", which will check if the ref is under refs/notes/

OK, then we are in a much better shape than I thought ;-).  Thanks.

  reply	other threads:[~2015-08-17 17:22 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-14 21:13 [PATCH v7 0/4] notes.mergestrategy option(s) Jacob Keller
2015-08-14 21:13 ` [PATCH v7 1/4] notes: document cat_sort_uniq rewriteMode Jacob Keller
2015-08-14 22:11   ` Junio C Hamano
2015-08-14 22:53     ` Jacob Keller
2015-08-15 10:06       ` Johan Herland
2015-08-14 21:13 ` [PATCH v7 2/4] notes: add tests for --commit/--abort/--strategy exclusivity Jacob Keller
2015-08-14 21:13 ` [PATCH v7 3/4] notes: add notes.mergestrategy option to select default strategy Jacob Keller
2015-08-15  9:09   ` Johan Herland
2015-08-14 21:13 ` [PATCH v7 4/4] notes: teach git-notes about notes.<ref>.mergestrategy option Jacob Keller
2015-08-14 22:01   ` Junio C Hamano
2015-08-14 22:10     ` Eric Sunshine
2015-08-14 22:50       ` Jacob Keller
2015-08-17 17:33         ` Junio C Hamano
2015-08-14 22:48     ` Jacob Keller
2015-08-17 17:22       ` Junio C Hamano [this message]
2015-08-15  9:25   ` Johan Herland

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=xmqqpp2lesns.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jacob.e.keller@intel.com \
    --cc=jacob.keller@gmail.com \
    --cc=johan@herland.net \
    --cc=mhagger@alum.mit.edu \
    --cc=sunshine@sunshineco.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.