From: Max Kirillov <max@max630.net>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jens Lehmann" <Jens.Lehmann@web.de>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Max Kirillov <max@max630.net>
Subject: [PATCH v4 1/2] submodule refactor: use git_path_submodule() in add_submodule_odb()
Date: Wed, 18 Mar 2015 23:10:51 +0200 [thread overview]
Message-ID: <1426713052-19171-2-git-send-email-max@max630.net> (raw)
In-Reply-To: <1426713052-19171-1-git-send-email-max@max630.net>
Signed-off-by: Max Kirillov <max@max630.net>
---
submodule.c | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/submodule.c b/submodule.c
index 34094f5..4aad3d4 100644
--- a/submodule.c
+++ b/submodule.c
@@ -122,43 +122,35 @@ void stage_updated_gitmodules(void)
static int add_submodule_odb(const char *path)
{
- struct strbuf objects_directory = STRBUF_INIT;
struct alternate_object_database *alt_odb;
+ const char* objects_directory;
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/");
- if (!is_directory(objects_directory.buf)) {
+ objects_directory = git_path_submodule(path, "objects/");
+ if (!is_directory(objects_directory)) {
ret = -1;
goto done;
}
+
/* avoid adding it twice */
for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next)
- if (alt_odb->name - alt_odb->base == objects_directory.len &&
- !strncmp(alt_odb->base, objects_directory.buf,
- objects_directory.len))
+ if (alt_odb->name - alt_odb->base == strlen(objects_directory) &&
+ !strcmp(alt_odb->base, objects_directory))
goto done;
- alt_odb = xmalloc(objects_directory.len + 42 + sizeof(*alt_odb));
+ alt_odb = xmalloc(strlen(objects_directory) + 42 + sizeof(*alt_odb));
alt_odb->next = alt_odb_list;
- strcpy(alt_odb->base, objects_directory.buf);
- alt_odb->name = alt_odb->base + objects_directory.len;
+ strcpy(alt_odb->base, objects_directory);
+ alt_odb->name = alt_odb->base + strlen(objects_directory);
alt_odb->name[2] = '/';
alt_odb->name[40] = '\0';
alt_odb->name[41] = '\0';
alt_odb_list = alt_odb;
/* add possible alternates from the submodule */
- read_info_alternates(objects_directory.buf, 0);
+ read_info_alternates(objects_directory, 0);
prepare_alt_odb();
done:
- strbuf_release(&objects_directory);
return ret;
}
--
2.1.1.391.g7a54a76
next prev parent reply other threads:[~2015-03-18 21:19 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 ` Max Kirillov [this message]
2015-03-18 21:10 ` [PATCH v4 2/2] " 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
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=1426713052-19171-2-git-send-email-max@max630.net \
--to=max@max630.net \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.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).