Merge branch 'jh/resize-convert-scratch-buffer'

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 16ef9325e0d9985c36fd525016340246caaa1af8..ef053f716c300ec13a06a63119bc7e3a289d2494 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -10,6 +10,7 @@
 #include "../object.h"
 #include "../dir.h"
 #include "../chdir-notify.h"
+#include "worktree.h"
 
 /*
  * This backend uses the following flags in `ref_update::flags` for
@@ -149,6 +150,25 @@ static struct files_ref_store *files_downcast(struct ref_store *ref_store,
        return refs;
 }
 
+static void files_reflog_path_other_worktrees(struct files_ref_store *refs,
+                                             struct strbuf *sb,
+                                             const char *refname)
+{
+       const char *real_ref;
+       const char *worktree_name;
+       int length;
+
+       if (parse_worktree_ref(refname, &worktree_name, &length, &real_ref))
+               BUG("refname %s is not a other-worktree ref", refname);
+
+       if (worktree_name)
+               strbuf_addf(sb, "%s/worktrees/%.*s/logs/%s", refs->gitcommondir,
+                           length, worktree_name, real_ref);
+       else
+               strbuf_addf(sb, "%s/logs/%s", refs->gitcommondir,
+                           real_ref);
+}
+
 static void files_reflog_path(struct files_ref_store *refs,
                              struct strbuf *sb,
                              const char *refname)
@@ -158,6 +178,10 @@ static void files_reflog_path(struct files_ref_store *refs,
        case REF_TYPE_PSEUDOREF:
                strbuf_addf(sb, "%s/logs/%s", refs->gitdir, refname);
                break;
+       case REF_TYPE_OTHER_PSEUDOREF:
+       case REF_TYPE_MAIN_PSEUDOREF:
+               files_reflog_path_other_worktrees(refs, sb, refname);
+               break;
        case REF_TYPE_NORMAL:
                strbuf_addf(sb, "%s/logs/%s", refs->gitcommondir, refname);
                break;
@@ -176,6 +200,11 @@ static void files_ref_path(struct files_ref_store *refs,
        case REF_TYPE_PSEUDOREF:
                strbuf_addf(sb, "%s/%s", refs->gitdir, refname);
                break;
+       case REF_TYPE_MAIN_PSEUDOREF:
+               if (!skip_prefix(refname, "main-worktree/", &refname))
+                       BUG("ref %s is not a main pseudoref", refname);
+               /* fallthrough */
+       case REF_TYPE_OTHER_PSEUDOREF:
        case REF_TYPE_NORMAL:
                strbuf_addf(sb, "%s/%s", refs->gitcommondir, refname);
                break;
@@ -269,9 +298,9 @@ static void loose_fill_ref_dir(struct ref_store *ref_store,
        closedir(d);
 
        /*
-        * Manually add refs/bisect, which, being per-worktree, might
-        * not appear in the directory listing for refs/ in the main
-        * repo.
+        * Manually add refs/bisect and refs/worktree, which, being
+        * per-worktree, might not appear in the directory listing for
+        * refs/ in the main repo.
         */
        if (!strcmp(dirname, "refs/")) {
                int pos = search_ref_dir(dir, "refs/bisect/", 12);
@@ -281,6 +310,14 @@ static void loose_fill_ref_dir(struct ref_store *ref_store,
                                        dir->cache, "refs/bisect/", 12, 1);
                        add_entry_to_dir(dir, child_entry);
                }
+
+               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);
+                       add_entry_to_dir(dir, child_entry);
+               }
        }
 }
 
@@ -2217,8 +2254,7 @@ static int split_head_update(struct ref_update *update,
  * Note that the new update will itself be subject to splitting when
  * the iteration gets to it.
  */
-static int split_symref_update(struct files_ref_store *refs,
-                              struct ref_update *update,
+static int split_symref_update(struct ref_update *update,
                               const char *referent,
                               struct ref_transaction *transaction,
                               struct string_list *affected_refnames,
@@ -2412,7 +2448,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
                         * of processing the split-off update, so we
                         * don't have to do it here.
                         */
-                       ret = split_symref_update(refs, update,
+                       ret = split_symref_update(update,
                                                  referent.buf, transaction,
                                                  affected_refnames, err);
                        if (ret)