mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 18:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()

Browse Source 
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.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2019-03-07 19:29:16 +07:00 committed by Junio C Hamano
parent 09e65645e3
commit 90d31ff5d4
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
refs/files-backend.c
View File

@ -220,22 +220,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) 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/")) if (strcmp(dirname, "refs/"))
return; return;
pos = search_ref_dir(dir, "refs/bisect/", 12); for (ip = 0; ip < ARRAY_SIZE(prefixes); ip++) {
if (pos < 0) { const char *prefix = prefixes[ip];
struct ref_entry *child_entry = int prefix_len = strlen(prefix);
create_dir_entry(dir->cache, "refs/bisect/", 12, 1); struct ref_entry *child_entry;
add_entry_to_dir(dir, child_entry); int pos;
}
pos = search_ref_dir(dir, "refs/worktree/", 11); pos = search_ref_dir(dir, prefix, prefix_len);
if (pos < 0) { if (pos >= 0)
struct ref_entry *child_entry = continue;
create_dir_entry(dir->cache, "refs/worktree/", 11, 1); child_entry = create_dir_entry(dir->cache, prefix, prefix_len, 1);
add_entry_to_dir(dir, child_entry); add_entry_to_dir(dir, child_entry);
} }
} }