From: Stefan Beller <sbeller@google.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH 17/19] submodule: use submodule repos for object lookup
Date: Tue, 16 Oct 2018 16:16:49 -0700 [thread overview]
Message-ID: <CAGZ79kbNybApS60pvusO0OiLVca+JtN=X3vTG3dHiRDSfoy4yA@mail.gmail.com> (raw)
In-Reply-To: <20181016231343.189184-1-jonathantanmy@google.com>
On Tue, Oct 16, 2018 at 4:13 PM Jonathan Tan <jonathantanmy@google.com> wrote:
>
> > Thanks for the review of the whole series!
> >
> > I have redone this series, addressing all your comments. I addressed
> > this comment differently than suggested, and put the submodule
> > repository argument at the end of the parameter list, such that it
> > goes with all the other arguments to be filled in.
>
> Sounds good.
Actually I changed my mind on that after figuring out how to free
the submodule repository appropriately and went with your original suggestion.
>
> > I was about to resend the series, but test-merged with the other
> > submodule series in flight (origin/sb/submodule-recursive-fetch-gets-the-tip)
> > which had some conflicts that I can easily resolve by rebasing on top.
>
> I presume you are talking about [1]? Maybe consider rebasing that one on
> top of this instead, since this is just a refactoring whereas
> submodule-recursive-fetch-gets-the-tip changes functionality, from what
> I understand of patches 8 and 9.
From my understanding, that series is further along than this one,
so I would not want to mix up their order.
Currently I am rebasing this on top of select topics from next,
(ds/reachable) as that are the other conflicts that I'd have to deal with.
> [1] https://public-inbox.org/git/20181016181327.107186-1-sbeller@google.com/
>
> > It conflicts a lot when merging to next, due to the latest patch
> > ("Apply semantic patches from previous patches"), so I am not sure
> > how to proceed properly. Maybe we'd omit that patch and
> > run 'make coccicheck' on next to apply the semantic patches
> > there instead.
>
> Omitting the patch sounds good to me. For me, just stating that you have
> excluded any coccinelle-generated patches in order to ease merging into
> the various branches is sufficient, and people can test the coccinelle
> patches included by running "make coccicheck" then "patch -p1
> <contrib/coccinelle/the_repository.cocci.patch".
ok.
Thanks,
Stefan
next prev parent reply other threads:[~2018-10-16 23:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 21:17 [RFC PATCH 00/19] Bring more repository handles into our code base Stefan Beller
2018-10-11 21:17 ` [PATCH 01/19] sha1_file: allow read_object to read objects in arbitrary repositories Stefan Beller
2018-10-11 21:17 ` [PATCH 02/19] packfile: allow has_packed_and_bad to handle " Stefan Beller
2018-10-11 21:17 ` [PATCH 03/19] object-store: allow read_object_file_extended to read from " Stefan Beller
2018-10-11 21:58 ` Jonathan Tan
2018-10-11 21:17 ` [PATCH 04/19] object-store: prepare read_object_file to deal with " Stefan Beller
2018-10-11 22:01 ` Jonathan Tan
2018-10-11 22:02 ` Stefan Beller
2018-10-11 21:17 ` [PATCH 05/19] object: parse_object to honor its repository argument Stefan Beller
2018-10-11 22:11 ` Jonathan Tan
2018-10-13 0:00 ` Stefan Beller
2018-10-11 21:17 ` [PATCH 06/19] commit: allow parse_commit* to handle arbitrary repositories Stefan Beller
2018-10-11 21:17 ` [PATCH 07/19] commit.c: allow paint_down_to_common " Stefan Beller
2018-10-11 21:17 ` [PATCH 08/19] commit.c: allow merge_bases_many " Stefan Beller
2018-10-11 21:17 ` [PATCH 09/19] commit.c: allow remove_redundant " Stefan Beller
2018-10-11 21:17 ` [PATCH 10/19] commit: allow get_merge_bases_many_0 " Stefan Beller
2018-10-11 21:17 ` [PATCH 11/19] commit: prepare get_merge_bases " Stefan Beller
2018-10-11 21:17 ` [PATCH 12/19] commit: prepare get_commit_buffer " Stefan Beller
2018-10-11 21:17 ` [PATCH 13/19] commit: prepare in_merge_bases[_many] " Stefan Beller
2018-10-11 21:17 ` [PATCH 14/19] commit: prepare repo_unuse_commit_buffer " Stefan Beller
2018-10-11 21:17 ` [PATCH 15/19] commit: prepare logmsg_reencode " Stefan Beller
2018-10-11 21:17 ` [PATCH 16/19] pretty: prepare format_commit_message " Stefan Beller
2018-10-11 22:22 ` Jonathan Tan
2018-10-11 21:17 ` [PATCH 17/19] submodule: use submodule repos for object lookup Stefan Beller
2018-10-11 22:40 ` Jonathan Tan
2018-10-13 0:20 ` Stefan Beller
2018-10-16 19:30 ` Stefan Beller
2018-10-16 23:13 ` Jonathan Tan
2018-10-16 23:16 ` Stefan Beller [this message]
2018-10-11 21:17 ` [PATCH 18/19] submodule: don't add submodule as odb for push Stefan Beller
2018-10-11 23:00 ` Jonathan Tan
2018-10-11 23:09 ` Stefan Beller
2018-10-11 21:17 ` [PATCH 19/19] Apply semantic patches from previous patches Stefan Beller
2018-10-11 23:07 ` [RFC PATCH 00/19] Bring more repository handles into our code base Jonathan Tan
2018-10-11 23:31 ` Junio C Hamano
2018-10-12 18:50 ` Jonathan Nieder
2018-10-13 0:30 ` Stefan Beller
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='CAGZ79kbNybApS60pvusO0OiLVca+JtN=X3vTG3dHiRDSfoy4yA@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.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.
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).