From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: [PATCH v5 0/6] Kill manual ref parsing code in worktree.c
Date: Mon, 24 Apr 2017 21:30:16 -0700 [thread overview]
Message-ID: <xmqqbmrlw1lz.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170424100124.24637-1-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Mon, 24 Apr 2017 17:01:18 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> v5 chanes are mostly cosmetic:
Good changes. Will re-queue.
Thanks.
>
> diff --git a/refs.c b/refs.c
> index 5d31fb6bcf..7972720256 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1530,11 +1530,7 @@ struct ref_store *get_main_ref_store(void)
> if (main_ref_store)
> return main_ref_store;
>
> - main_ref_store = ref_store_init(get_git_dir(),
> - (REF_STORE_READ |
> - REF_STORE_WRITE |
> - REF_STORE_ODB |
> - REF_STORE_MAIN));
> + main_ref_store = ref_store_init(get_git_dir(), REF_STORE_ALL_CAPS);
> return main_ref_store;
> }
>
> @@ -1597,9 +1593,6 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
> struct ref_store *get_worktree_ref_store(const struct worktree *wt)
> {
> struct ref_store *refs;
> - unsigned int refs_all_capabilities =
> - REF_STORE_READ | REF_STORE_WRITE |
> - REF_STORE_ODB | REF_STORE_MAIN;
> const char *id;
>
> if (wt->is_current)
> @@ -1612,10 +1605,10 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt)
>
> if (wt->id)
> refs = ref_store_init(git_common_path("worktrees/%s", wt->id),
> - refs_all_capabilities);
> + REF_STORE_ALL_CAPS);
> else
> refs = ref_store_init(get_git_common_dir(),
> - refs_all_capabilities);
> + REF_STORE_ALL_CAPS);
>
> if (refs)
> register_ref_store_map(&worktree_ref_stores, "worktree",
> diff --git a/refs/refs-internal.h b/refs/refs-internal.h
> index 690498698e..b26f7e41ce 100644
> --- a/refs/refs-internal.h
> +++ b/refs/refs-internal.h
> @@ -467,6 +467,10 @@ struct ref_store;
> #define REF_STORE_WRITE (1 << 1) /* can perform update operations */
> #define REF_STORE_ODB (1 << 2) /* has access to object database */
> #define REF_STORE_MAIN (1 << 3)
> +#define REF_STORE_ALL_CAPS (REF_STORE_READ | \
> + REF_STORE_WRITE | \
> + REF_STORE_ODB | \
> + REF_STORE_MAIN)
>
> /*
> * Initialize the ref_store for the specified gitdir. These functions
>
> Nguyễn Thái Ngọc Duy (6):
> environment.c: fix potential segfault by get_git_common_dir()
> refs.c: make submodule ref store hashmap generic
> refs: add REFS_STORE_ALL_CAPS
> refs: introduce get_worktree_ref_store()
> worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()
> refs: kill set_worktree_head_symref()
>
> branch.c | 15 ++---
> environment.c | 2 +
> refs.c | 100 ++++++++++++++++++++------------
> refs.h | 12 +---
> refs/files-backend.c | 44 --------------
> refs/refs-internal.h | 4 ++
> t/helper/test-ref-store.c | 18 ++++++
> t/t1407-worktree-ref-store.sh (new +x) | 52 +++++++++++++++++
> worktree.c | 102 +++++++++------------------------
> worktree.h | 2 +-
> 10 files changed, 177 insertions(+), 174 deletions(-)
> create mode 100755 t/t1407-worktree-ref-store.sh
prev parent reply other threads:[~2017-04-25 4:30 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 11:31 [PATCH RFC 0/2] Kill manual ref parsing code in worktree.c Nguyễn Thái Ngọc Duy
2017-02-08 11:31 ` [PATCH 1/2] refs.c: add resolve_ref_submodule() Nguyễn Thái Ngọc Duy
2017-02-09 5:20 ` Michael Haggerty
2017-02-08 11:31 ` [PATCH 2/2] worktree.c: use submodule interface to access refs from another worktree Nguyễn Thái Ngọc Duy
2017-02-08 19:50 ` Stefan Beller
2017-02-08 23:19 ` Junio C Hamano
2017-02-08 23:25 ` Junio C Hamano
2017-02-09 6:07 ` Michael Haggerty
2017-02-09 6:55 ` Junio C Hamano
2017-02-09 8:04 ` Michael Haggerty
2017-02-09 11:59 ` Duy Nguyen
2017-02-09 14:03 ` Michael Haggerty
2017-02-08 18:18 ` [PATCH RFC 0/2] Kill manual ref parsing code in worktree.c Junio C Hamano
2017-02-16 12:02 ` [PATCH v2 0/5] " Nguyễn Thái Ngọc Duy
2017-02-16 12:02 ` [PATCH v2 1/5] refs: introduce get_worktree_ref_store() Nguyễn Thái Ngọc Duy
2017-02-16 12:02 ` [PATCH v2 2/5] refs.c: add refs_resolve_ref_unsafe() Nguyễn Thái Ngọc Duy
2017-02-16 12:03 ` [PATCH v2 3/5] worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() Nguyễn Thái Ngọc Duy
2017-02-16 12:03 ` [PATCH v2 4/5] refs: add refs_create_symref() Nguyễn Thái Ngọc Duy
2017-02-16 12:03 ` [PATCH v2 5/5] refs: kill set_worktree_head_symref() Nguyễn Thái Ngọc Duy
2017-03-18 10:02 ` [PATCH v3 0/4] Kill manual ref parsing code in worktree.c Nguyễn Thái Ngọc Duy
2017-03-18 10:02 ` [PATCH v3 1/4] environment.c: fix potential segfault by get_git_common_dir() Nguyễn Thái Ngọc Duy
2017-03-18 17:54 ` Junio C Hamano
2017-03-19 9:34 ` Duy Nguyen
2017-03-18 10:02 ` [PATCH v3 2/4] refs: introduce get_worktree_ref_store() Nguyễn Thái Ngọc Duy
2017-03-20 6:59 ` Michael Haggerty
2017-03-20 12:01 ` Duy Nguyen
2017-03-20 14:25 ` Michael Haggerty
2017-03-26 8:26 ` Duy Nguyen
2017-03-18 10:02 ` [PATCH v3 3/4] worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() Nguyễn Thái Ngọc Duy
2017-03-18 10:02 ` [PATCH v3 4/4] refs: kill set_worktree_head_symref() Nguyễn Thái Ngọc Duy
2017-03-18 17:49 ` [PATCH v3 0/4] Kill manual ref parsing code in worktree.c Junio C Hamano
2017-04-04 10:21 ` [PATCH v4 0/5] " Nguyễn Thái Ngọc Duy
2017-04-04 10:21 ` [PATCH v4 1/5] environment.c: fix potential segfault by get_git_common_dir() Nguyễn Thái Ngọc Duy
2017-04-04 10:21 ` [PATCH v4 2/5] refs.c: make submodule ref store hashmap generic Nguyễn Thái Ngọc Duy
2017-04-04 10:21 ` [PATCH v4 3/5] refs: introduce get_worktree_ref_store() Nguyễn Thái Ngọc Duy
2017-04-22 4:52 ` Michael Haggerty
2017-04-04 10:21 ` [PATCH v4 4/5] worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() Nguyễn Thái Ngọc Duy
2017-04-04 10:21 ` [PATCH v4 5/5] refs: kill set_worktree_head_symref() Nguyễn Thái Ngọc Duy
2017-04-14 1:40 ` [PATCH v4 0/5] Kill manual ref parsing code in worktree.c Junio C Hamano
2017-04-14 2:02 ` Junio C Hamano
2017-04-14 12:45 ` Duy Nguyen
2017-04-17 1:36 ` Junio C Hamano
2017-04-22 5:06 ` Michael Haggerty
2017-04-24 10:01 ` [PATCH v5 0/6] " Nguyễn Thái Ngọc Duy
2017-04-24 10:01 ` [PATCH v5 1/6] environment.c: fix potential segfault by get_git_common_dir() Nguyễn Thái Ngọc Duy
2017-04-24 10:01 ` [PATCH v5 2/6] refs.c: make submodule ref store hashmap generic Nguyễn Thái Ngọc Duy
2017-04-24 10:01 ` [PATCH v5 3/6] refs: add REFS_STORE_ALL_CAPS Nguyễn Thái Ngọc Duy
2017-04-24 10:01 ` [PATCH v5 4/6] refs: introduce get_worktree_ref_store() Nguyễn Thái Ngọc Duy
2017-04-24 10:01 ` [PATCH v5 5/6] worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() Nguyễn Thái Ngọc Duy
2017-04-24 10:01 ` [PATCH v5 6/6] refs: kill set_worktree_head_symref() Nguyễn Thái Ngọc Duy
2017-04-25 4:30 ` Junio C Hamano [this message]
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=xmqqbmrlw1lz.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--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).