Re: [PATCH 2/3] files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Mar 7, 2019, 14:44 UTC
- Message-ID
- <3c50aa4f-127a-1be8-2d3e-1941f01d2fa0@gmail.com>
- In-Reply-To
- <20190307122917.12811-3-pclouds@gmail.com>
Hi Duy
On 07/03/2019 12:29, Nguyễn Thái Ngọc Duy wrote:
Show 6 quoted lines
> This function is duplicated to handle refs/bisect/ and refs/worktree/ > and a third prefix is coming. Time to clean up. > > This also fixes incorrect "refs/worktrees/" length in this code. The > correct length is 14 not 11. The test in the next patch will also cover > this.
I ran strace this morning and saw
openat(AT_FDCWD, "/tmp/x/repo/.git/refs/worktr", O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_DIRECTORY) = -1 ENOENT (No such file or directory)
I was just about to email you about it but you've already fixed it!
Best Wishes
Phillip
Show 45 quoted lines
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> refs/files-backend.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/refs/files-backend.c b/refs/files-backend.c
> index 26417893c8..3d0e06edcd 100644
> --- a/refs/files-backend.c
> +++ b/refs/files-backend.c
> @@ -221,22 +221,22 @@ static void files_ref_path(struct files_ref_store *refs,
> */
> static void add_per_worktree_entries_to_dir(struct ref_dir *dir, const char *dirname)
> {
> - int pos;
> + const char *prefixes[] = { "refs/bisect/", "refs/worktree/" };
> + int ip;
>
> if (strcmp(dirname, "refs/"))
> return;
>
> - pos = search_ref_dir(dir, "refs/bisect/", 12);
> - if (pos < 0) {
> - struct ref_entry *child_entry =
> - create_dir_entry(dir->cache, "refs/bisect/", 12, 1);
> - add_entry_to_dir(dir, child_entry);
> - }
> + for (ip = 0; ip < ARRAY_SIZE(prefixes); ip++) {
> + const char *prefix = prefixes[ip];
> + int prefix_len = strlen(prefix);
> + struct ref_entry *child_entry;
> + int pos;
>
> - pos = search_ref_dir(dir, "refs/worktree/", 11);
> - if (pos < 0) {
> - struct ref_entry *child_entry =
> - create_dir_entry(dir->cache, "refs/worktree/", 11, 1);
> + pos = search_ref_dir(dir, prefix, prefix_len);
> + if (pos >= 0)
> + continue;
> + child_entry = create_dir_entry(dir->cache, prefix, prefix_len, 1);
> add_entry_to_dir(dir, child_entry);
> }
> }
>