From: Johan Herland <johan@herland.net>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: Git mailing list <git@vger.kernel.org>,
Mike Hommey <mh@glandium.org>,
Michael Haggerty <mhagger@alum.mit.edu>,
Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH v2] notes: allow merging from arbitrary references
Date: Sun, 17 Jan 2016 11:00:27 +0100 [thread overview]
Message-ID: <CALKQrgfsnhpvqoEMjv40mvb_ZifgXddvimFugnXcMoQH-Hhi7A@mail.gmail.com> (raw)
In-Reply-To: <1452883636-27753-1-git-send-email-jacob.e.keller@intel.com>
On Fri, Jan 15, 2016 at 7:47 PM, Jacob Keller <jacob.e.keller@intel.com> wrote:
> From: Jacob Keller <jacob.keller@gmail.com>
>
> Create a new expansion function, expand_loose_notes_ref which will first
> check whether the ref can be found using get_sha1. If it can't be found
> then it will fallback to using expand_notes_ref. The content of the
> strbuf will not be changed if the notes ref can be located using
> get_sha1. Otherwise, it may be updated as done by expand_notes_ref.
>
> Since we now support merging from non-notes refs, remove the test case
> associated with that behavior. Add a test case for merging from a
> non-notes ref.
>
> Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
> ---
>
> Notes:
> - v2
> * don't expand notes-ref to the sha1, in order to support get-ref better
> * fix failed tests due to mis-use of argv[0] instead of remote_ref.buf
>
> This is a resend, since no one reviewed this last time, and it's been a
> couple of weeks. At least one person has reviewed a previous version,
> but I'd like some fresh eyes on this latest version. This should be
> identical to the previous patch.
Reviewed-by: Johan Herland <johan@herland.net>
--
Johan Herland, <johan@herland.net>
www.herland.net
next prev parent reply other threads:[~2016-01-17 10:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 18:47 [PATCH v2] notes: allow merging from arbitrary references Jacob Keller
2016-01-17 10:00 ` Johan Herland [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-29 22:40 Jacob Keller
2015-11-20 18:51 Jacob Keller
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=CALKQrgfsnhpvqoEMjv40mvb_ZifgXddvimFugnXcMoQH-Hhi7A@mail.gmail.com \
--to=johan@herland.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.com \
--cc=mh@glandium.org \
--cc=mhagger@alum.mit.edu \
/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).