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 v9 1/2] submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
Date: Mon, 14 Sep 2015 11:00:56 -0700 [thread overview]
Message-ID: <xmqqoah4x4mf.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1442182662-28834-2-git-send-email-max@max630.net> (Max Kirillov's message of "Mon, 14 Sep 2015 01:17:41 +0300")
Max Kirillov <max@max630•net> writes:
> Functions which directly operate submodule's object database do not
> handle the case when the submodule is linked worktree (which are
> introduced in c7b3a3d2fe). Instead of fixing the path calculation use
> already existing strbuf_git_path_submodule() function without changing
> overall behaviour. Then it will be possible to modify only that function
> whenever we need to change real location of submodule's repository
> content.
>
> Edited-by: Jeff King <peff@peff•net>
> Signed-off-by: Max Kirillov <max@max630•net>
> ---
> submodule.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
This certainly is a lot nicer ;-)
Thanks.
>
> diff --git a/submodule.c b/submodule.c
> index 245ed4d..16b7c35 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -124,13 +124,7 @@ static int add_submodule_odb(const char *path)
> int ret = 0;
> const char *git_dir;
>
> - strbuf_addf(&objects_directory, "%s/.git", path);
> - git_dir = read_gitfile(objects_directory.buf);
> - if (git_dir) {
> - strbuf_reset(&objects_directory);
> - strbuf_addstr(&objects_directory, git_dir);
> - }
> - strbuf_addstr(&objects_directory, "/objects/");
> + strbuf_git_path_submodule(&objects_directory, path, "objects/");
> if (!is_directory(objects_directory.buf)) {
> ret = -1;
> goto done;
next prev parent reply other threads:[~2015-09-14 18:01 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
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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqoah4x4mf.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Jens.Lehmann@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=hvoigt@hvoigt$(echo .)net \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=max@max630$(echo .)net \
--cc=pclouds@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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