get_ref_dir(): require that the dirname argument ends in '/'

This removes some conditional code and makes it consistent with the
way that direntry names are stored.  Please note that this function is
never used on the top-level .git directory; it is always called for
directories at level .git/refs or deeper.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 37ea557f3e843548d8418c51ec283aa05d4a4c14..113739f14f72ce8c472e812bd7af22cf5572a712 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -749,13 +749,17 @@ void add_packed_ref(const char *refname, const unsigned char *sha1)
                        create_ref_entry(refname, sha1, REF_ISPACKED, 1));
 }
 
+/*
+ * Read the loose references for refs from the namespace dirname.
+ * dirname must end with '/'.
+ */
 static void get_ref_dir(struct ref_cache *refs, const char *dirname,
                        struct ref_dir *dir)
 {
        DIR *d;
        const char *path;
        struct dirent *de;
-       int dirnamelen;
+       int dirnamelen = strlen(dirname);
        struct strbuf refname;
 
        if (*refs->name)
@@ -767,13 +771,8 @@ static void get_ref_dir(struct ref_cache *refs, const char *dirname,
        if (!d)
                return;
 
-       dirnamelen = strlen(dirname);
        strbuf_init(&refname, dirnamelen + 257);
        strbuf_add(&refname, dirname, dirnamelen);
-       if (dirnamelen && dirname[dirnamelen-1] != '/') {
-               strbuf_addch(&refname, '/');
-               dirnamelen++;
-       }
 
        while ((de = readdir(d)) != NULL) {
                unsigned char sha1[20];
@@ -792,6 +791,7 @@ static void get_ref_dir(struct ref_cache *refs, const char *dirname,
                if (stat(refdir, &st) < 0) {
                        ; /* silently ignore */
                } else if (S_ISDIR(st.st_mode)) {
+                       strbuf_addch(&refname, '/');
                        get_ref_dir(refs, refname.buf, dir);
                } else {
                        if (*refs->name) {
@@ -816,7 +816,7 @@ static void get_ref_dir(struct ref_cache *refs, const char *dirname,
 static struct ref_dir *get_loose_refs(struct ref_cache *refs)
 {
        if (!refs->did_loose) {
-               get_ref_dir(refs, "refs", &refs->loose);
+               get_ref_dir(refs, "refs/", &refs->loose);
                refs->did_loose = 1;
        }
        return &refs->loose;