[PATCH 13/15] files-backend: make reflog iterator go through per-worktree reflog

[Nguyễn Thái Ngọc Duy]

Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 refs/files-backend.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 011a7e256..d429f8713 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3314,6 +3314,7 @@ struct files_reflog_iterator {
        struct ref_iterator base;
 
        struct dir_iterator *dir_iterator;
+       struct dir_iterator *dir_iterator2;
        struct object_id oid;
 };
 
@@ -3334,6 +3335,10 @@ static int files_reflog_iterator_advance(struct 
ref_iterator *ref_iterator)
                if (ends_with(diter->basename, ".lock"))
                        continue;
 
+               if (iter->dir_iterator2 &&
+                   starts_with(diter->relative_path, "refs/bisect/"))
+                       continue;
+
                if (read_ref_full(diter->relative_path, 0,
                                  iter->oid.hash, &flags)) {
                        error("bad ref for %s", diter->path.buf);
@@ -3346,7 +3351,11 @@ static int files_reflog_iterator_advance(struct 
ref_iterator *ref_iterator)
                return ITER_OK;
        }
 
-       iter->dir_iterator = NULL;
+       iter->dir_iterator = iter->dir_iterator2;
+       if (iter->dir_iterator2) {
+               iter->dir_iterator2 = NULL;
+               return files_reflog_iterator_advance(ref_iterator);
+       }
        if (ref_iterator_abort(ref_iterator) == ITER_ERROR)
                ok = ITER_ERROR;
        return ok;
@@ -3367,6 +3376,12 @@ static int files_reflog_iterator_abort(struct 
ref_iterator *ref_iterator)
        if (iter->dir_iterator)
                ok = dir_iterator_abort(iter->dir_iterator);
 
+       if (iter->dir_iterator2) {
+               int ok2 = dir_iterator_abort(iter->dir_iterator2);
+               if (ok2 == ITER_ERROR)
+                       ok = ok2;
+       }
+
        base_ref_iterator_free(ref_iterator);
        return ok;
 }
@@ -3389,6 +3404,13 @@ static struct ref_iterator 
*files_reflog_iterator_begin(struct ref_store *ref_st
        files_path(refs, &sb, "logs");
        iter->dir_iterator = dir_iterator_begin(sb.buf);
        strbuf_release(&sb);
+
+       if (strcmp(refs->gitdir.buf, refs->gitcommondir.buf)) {
+               strbuf_addf(&sb, "%s/logs", refs->gitdir.buf);
+               iter->dir_iterator2 = dir_iterator_begin(sb.buf);
+               strbuf_release(&sb);
+       }
+
        return ref_iterator;
 }
 
-- 
2.11.0.157.gd943d85