do_for_each_reflog(): return early on error

diff --git a/refs.c b/refs.c
index 9471b1d8a6c4d7e6d59b311f2de0967877ef47d6..8c39bd76e5c9044ca867c91898b208eb82028f17 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -765,7 +765,8 @@ void add_packed_ref(const char *refname, const unsigned char *sha1)
 
 /*
  * Read the loose references for refs from the namespace dirname.
- * dirname must end with '/'.
+ * dirname must end with '/'.  dir must be the directory entry
+ * corresponding to dirname.
  */
 static void get_ref_dir(struct ref_cache *refs, const char *dirname,
                        struct ref_dir *dir)
@@ -806,7 +807,8 @@ static void get_ref_dir(struct ref_cache *refs, const char *dirname,
                        ; /* silently ignore */
                } else if (S_ISDIR(st.st_mode)) {
                        strbuf_addch(&refname, '/');
-                       get_ref_dir(refs, refname.buf, dir);
+                       get_ref_dir(refs, refname.buf,
+                                   &search_for_subdir(dir, refname.buf, 1)->u.subdir);
                } else {
                        if (*refs->name) {
                                hashclr(sha1);
@@ -819,7 +821,8 @@ static void get_ref_dir(struct ref_cache *refs, const char *dirname,
                                hashclr(sha1);
                                flag |= REF_ISBROKEN;
                        }
-                       add_ref(dir, create_ref_entry(refname.buf, sha1, flag, 1));
+                       add_entry_to_dir(dir,
+                                        create_ref_entry(refname.buf, sha1, flag, 1));
                }
                strbuf_setlen(&refname, dirnamelen);
        }
@@ -830,7 +833,8 @@ 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/",
+                           &search_for_subdir(&refs->loose, "refs/", 1)->u.subdir);
                refs->did_loose = 1;
        }
        return &refs->loose;
@@ -2242,47 +2246,47 @@ static int do_for_each_reflog(const char *base, each_ref_fn fn, void *cb_data)
 {
        DIR *d = opendir(git_path("logs/%s", base));
        int retval = 0;
+       struct dirent *de;
+       int baselen;
+       char *log;
 
-       if (d) {
-               struct dirent *de;
-               int baselen = strlen(base);
-               char *log = xmalloc(baselen + 257);
+       if (!d)
+               return *base ? errno : 0;
 
-               memcpy(log, base, baselen);
-               if (baselen && base[baselen-1] != '/')
-                       log[baselen++] = '/';
+       baselen = strlen(base);
+       log = xmalloc(baselen + 257);
+       memcpy(log, base, baselen);
+       if (baselen && base[baselen-1] != '/')
+               log[baselen++] = '/';
 
-               while ((de = readdir(d)) != NULL) {
-                       struct stat st;
-                       int namelen;
+       while ((de = readdir(d)) != NULL) {
+               struct stat st;
+               int namelen;
 
-                       if (de->d_name[0] == '.')
-                               continue;
-                       namelen = strlen(de->d_name);
-                       if (namelen > 255)
-                               continue;
-                       if (has_extension(de->d_name, ".lock"))
-                               continue;
-                       memcpy(log + baselen, de->d_name, namelen+1);
-                       if (stat(git_path("logs/%s", log), &st) < 0)
-                               continue;
-                       if (S_ISDIR(st.st_mode)) {
-                               retval = do_for_each_reflog(log, fn, cb_data);
-                       } else {
-                               unsigned char sha1[20];
-                               if (read_ref_full(log, sha1, 0, NULL))
-                                       retval = error("bad ref for %s", log);
-                               else
-                                       retval = fn(log, sha1, 0, cb_data);
-                       }
-                       if (retval)
-                               break;
+               if (de->d_name[0] == '.')
+                       continue;
+               namelen = strlen(de->d_name);
+               if (namelen > 255)
+                       continue;
+               if (has_extension(de->d_name, ".lock"))
+                       continue;
+               memcpy(log + baselen, de->d_name, namelen+1);
+               if (stat(git_path("logs/%s", log), &st) < 0)
+                       continue;
+               if (S_ISDIR(st.st_mode)) {
+                       retval = do_for_each_reflog(log, fn, cb_data);
+               } else {
+                       unsigned char sha1[20];
+                       if (read_ref_full(log, sha1, 0, NULL))
+                               retval = error("bad ref for %s", log);
+                       else
+                               retval = fn(log, sha1, 0, cb_data);
                }
-               free(log);
-               closedir(d);
+               if (retval)
+                       break;
        }
-       else if (*base)
-               return errno;
+       free(log);
+       closedir(d);
        return retval;
 }