From: Junio C Hamano <gitster@pobox.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Stefan Beller" <sbeller@google.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"David Turner" <novalis@novalis.org>,
git@vger.kernel.org
Subject: Re: [PATCH 4/5] files_ref_store::submodule: use NULL for the main repository
Date: Thu, 09 Feb 2017 13:19:17 -0800 [thread overview]
Message-ID: <xmqq1sv7oyei.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <111d663c0fd3e9669e7c28537f581833488ca4a6.1486629195.git.mhagger@alum.mit.edu> (Michael Haggerty's message of "Thu, 9 Feb 2017 14:27:01 +0100")
Michael Haggerty <mhagger@alum.mit.edu> writes:
> The old practice of storing the empty string in this member for the main
> repository was a holdover from before 00eebe3 (refs: create a base class
> "ref_store" for files_ref_store, 2016-09-04), when the submodule was
> stored in a flex array at the end of `struct files_ref_store`. Storing
> NULL for this case is more idiomatic and a tiny bit less code.
Yes. I noticed this bit in 3/5 and wondered about it, knowing this
step comes next:
> struct ref_store *ref_store_init(const char *submodule)
> {
> const char *be_name = "files";
> struct ref_storage_be *be = find_ref_storage_backend(be_name);
> + struct ref_store *refs;
>
> if (!be)
> die("BUG: reference backend %s is unknown", be_name);
>
> if (!submodule || !*submodule)
> - return be->init(NULL);
> + refs = be->init(NULL);
> else
> - return be->init(submodule);
> + refs = be->init(submodule);
Can't we also lose this "if !*submodule, turn it to NULL"?
> --- a/refs/files-backend.c
> +++ b/refs/files-backend.c
> @@ -980,7 +980,7 @@ static struct ref_store *files_ref_store_create(const char *submodule)
> struct files_ref_store *refs = xcalloc(1, sizeof(*refs));
> struct ref_store *ref_store = (struct ref_store *)refs;
>
> - base_ref_store_init(ref_store, &refs_be_files, submodule);
> + base_ref_store_init(ref_store, &refs_be_files);
>
> refs->submodule = submodule ? xstrdup(submodule) : "";
Also, can't we use xstrdup_or_null(submodule) with this step?
next prev parent reply other threads:[~2017-02-09 21:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-09 13:26 [PATCH 0/5] Store submodules in a hash, not a linked list Michael Haggerty
2017-02-09 13:26 ` [PATCH 1/5] refs: store submodule ref stores in a hashmap Michael Haggerty
2017-02-09 16:58 ` Stefan Beller
2017-02-09 17:40 ` Michael Haggerty
2017-02-09 17:43 ` Stefan Beller
2017-02-09 19:32 ` Jeff King
2017-02-09 20:34 ` Junio C Hamano
2017-02-10 4:04 ` Jeff King
2017-02-10 10:23 ` Michael Haggerty
2017-02-09 13:26 ` [PATCH 2/5] refs: push the submodule attribute down Michael Haggerty
2017-02-09 17:03 ` Stefan Beller
2017-02-09 21:07 ` Junio C Hamano
2017-02-09 13:27 ` [PATCH 3/5] register_ref_store(): new function Michael Haggerty
2017-02-09 17:20 ` Stefan Beller
2017-02-09 18:14 ` Michael Haggerty
2017-02-09 21:16 ` Junio C Hamano
2017-02-09 13:27 ` [PATCH 4/5] files_ref_store::submodule: use NULL for the main repository Michael Haggerty
2017-02-09 17:25 ` Stefan Beller
2017-02-09 21:19 ` Junio C Hamano [this message]
2017-02-09 21:36 ` Stefan Beller
2017-02-09 13:27 ` [PATCH 5/5] read_loose_refs(): read refs using resolve_ref_recursively() Michael Haggerty
2017-02-09 17:39 ` Stefan Beller
2017-02-09 19:48 ` [PATCH 0/5] Store submodules in a hash, not a linked list Junio C Hamano
2017-02-09 19:58 ` Jeff King
2017-02-09 21:23 ` Michael Haggerty
2017-02-10 0:40 ` Jeff King
2017-02-10 10:27 ` Michael Haggerty
2017-02-13 2:39 ` Duy Nguyen
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=xmqq1sv7oyei.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=novalis@novalis.org \
--cc=pclouds@gmail.com \
--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).