summaryrefslogtreecommitdiff
path: root/refs
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-03-07 12:29:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-08 02:57:47 (GMT)
commit90d31ff5d470286a8480311384429ebee8bbc939 (patch)
tree30d8ef0e4f5d69218d76aa9129152a54c077927b /refs
parent09e65645e3b092e4d93bb8513b14474c68df23d8 (diff)
downloadgit-90d31ff5d470286a8480311384429ebee8bbc939.zip
git-90d31ff5d470286a8480311384429ebee8bbc939.tar.gz
git-90d31ff5d470286a8480311384429ebee8bbc939.tar.bz2
files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
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>
Diffstat (limited to 'refs')
-rw-r--r--refs/files-backend.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 06ba49f..cb92677 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -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)
{
- 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);
}
}