From: Junio C Hamano <gitster@pobox.com>
To: Max Kirillov <max@max630.net>
Cc: Jens Lehmann <Jens.Lehmann@web.de>,
Duy Nguyen <pclouds@gmail.com>, Jeff King <peff@peff.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Heiko Voigt <hvoigt@hvoigt.net>,
Stefan Beller <sbeller@google.com>,
git@vger.kernel.org
Subject: Re: [PATCH v8 0/2] Submodule object path
Date: Mon, 14 Sep 2015 11:14:19 -0700 [thread overview]
Message-ID: <xmqqk2rsx404.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20150913223256.GB8042@wheezy.local> (Max Kirillov's message of "Mon, 14 Sep 2015 01:32:56 +0300")
Max Kirillov <max@max630.net> writes:
> On Thu, Sep 10, 2015 at 06:10:13PM -0700, Junio C Hamano wrote:
>> When I push the updated 'pu' out, could you please check
>
> I follow the pu merges. So far resolutions seem correct and
> all tests pass.
The primary thing I ask from "eyeballing by the original author" is
to see if "git diff M^ M" for the merge M of the topic is something
the original author would have done if he was given a starting point
of M^ to build his or her topic (which is what your "resolutions
seem correct" really is), so we are good.
> If you don't mind re-resolving it as I send newer versions I will
> base them on master.
So far rerere seems to be happy, so basing on the same commit is
fine, but I suspect this round should already be ready for 'next'.
I had to remove the now-unused variable "const char *git_dir;" in
[PATCH 1/2], but other than that it looked OK from a cursory re-read.
Thanks.
next prev parent reply other threads:[~2015-09-14 18:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-18 21:10 [PATCH v4 0/2] path: implement common_dir handling in git_path_submodule() Max Kirillov
2015-03-18 21:10 ` [PATCH v4 1/2] submodule refactor: use git_path_submodule() in add_submodule_odb() Max Kirillov
2015-03-18 21:10 ` [PATCH v4 2/2] path: implement common_dir handling in git_path_submodule() Max Kirillov
2015-08-03 21:03 ` [PATCH v5 0/2] " Max Kirillov
2015-08-03 21:03 ` [PATCH v5 1/2] submodule refactor: use git_path_submodule() in add_submodule_odb() Max Kirillov
2015-08-03 21:29 ` Junio C Hamano
2015-08-03 21:03 ` [PATCH v5 2/2] path: implement common_dir handling in git_path_submodule() Max Kirillov
2015-08-04 21:51 ` [PATCH v6 0/2] " Max Kirillov
2015-08-04 21:51 ` [PATCH v6 1/2] submodule refactor: use git_path_submodule() in add_submodule_odb() Max Kirillov
2015-08-04 21:51 ` [PATCH v6 2/2] path: implement common_dir handling in git_path_submodule() Max Kirillov
2015-08-04 22:05 ` [PATCH v7 0/2] " Max Kirillov
2015-08-04 22:05 ` [PATCH v7 1/2] submodule refactor: use git_path_submodule() in add_submodule_odb() Max Kirillov
2015-08-18 0:07 ` Stefan Beller
2015-08-04 22:05 ` [PATCH v7 2/2] path: implement common_dir handling in git_path_submodule() Max Kirillov
2015-08-17 23:56 ` Stefan Beller
2015-09-10 21:57 ` [PATCH v8 0/2] Submodule object path Max Kirillov
2015-09-10 21:57 ` [PATCH v8 1/2] submodule refactor: use git_pathdup_submodule() in add_submodule_odb() Max Kirillov
2015-09-11 7:53 ` Jeff King
2015-09-13 22:26 ` Max Kirillov
2015-09-10 21:57 ` [PATCH v8 2/2] path: implement common_dir handling in git_pathdup_submodule() Max Kirillov
2015-09-11 1:10 ` [PATCH v8 0/2] Submodule object path Junio C Hamano
2015-09-13 22:32 ` Max Kirillov
2015-09-14 18:14 ` Junio C Hamano [this message]
2015-09-13 22:17 ` [PATCH v9 " Max Kirillov
2015-09-13 22:17 ` [PATCH v9 1/2] submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() Max Kirillov
2015-09-14 18:00 ` Junio C Hamano
2015-09-13 22:17 ` [PATCH v9 2/2] path: implement common_dir handling in git_pathdup_submodule() Max Kirillov
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=xmqqk2rsx404.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=johannes.schindelin@gmx.de \
--cc=max@max630.net \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@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).