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>

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 06ba49f47ab1b465555f9128a91b9d0a51a55ef3..cb926771517f8d954f519fa6d45ff2d282be9d05 100644 (file)
--- 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)
 {
  */
 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;
 
 
        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);
        }
 }
                add_entry_to_dir(dir, child_entry);
        }
 }