usage: report vsnprintf(3) failure

[thirdparty/git.git] / reachable.c

diff --git a/reachable.c b/reachable.c
index f29b06a5d059e23030333f26d5ba0667872251ab..3b85add243ba79a4ccc90c9faacbb9fee2742303 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -17,6 +17,7 @@
 #include "pack-mtimes.h"
 #include "config.h"
 #include "run-command.h"
+#include "sequencer.h"
 
 struct connectivity_progress {
        struct progress *progress;
@@ -30,6 +31,52 @@ static void update_progress(struct connectivity_progress *cp)
                display_progress(cp->progress, cp->count);
 }
 
+static void add_one_file(const char *path, struct rev_info *revs)
+{
+       struct strbuf buf = STRBUF_INIT;
+       struct object_id oid;
+       struct object *object;
+
+       if (!read_oneliner(&buf, path, READ_ONELINER_SKIP_IF_EMPTY)) {
+               strbuf_release(&buf);
+               return;
+       }
+       strbuf_trim(&buf);
+       if (!get_oid_hex(buf.buf, &oid)) {
+               object = parse_object_or_die(&oid, buf.buf);
+               add_pending_object(revs, object, "");
+       }
+       strbuf_release(&buf);
+}
+
+/* Mark objects recorded in rebase state files as reachable. */
+static void add_rebase_files(struct rev_info *revs)
+{
+       struct strbuf buf = STRBUF_INIT;
+       size_t len;
+       const char *path[] = {
+               "rebase-apply/autostash",
+               "rebase-apply/orig-head",
+               "rebase-merge/autostash",
+               "rebase-merge/orig-head",
+       };
+       struct worktree **worktrees = get_worktrees();
+
+       for (struct worktree **wt = worktrees; *wt; wt++) {
+               strbuf_reset(&buf);
+               strbuf_addstr(&buf, get_worktree_git_dir(*wt));
+               strbuf_complete(&buf, '/');
+               len = buf.len;
+               for (size_t i = 0; i < ARRAY_SIZE(path); i++) {
+                       strbuf_setlen(&buf, len);
+                       strbuf_addstr(&buf, path[i]);
+                       add_one_file(buf.buf, revs);
+               }
+       }
+       strbuf_release(&buf);
+       free_worktrees(worktrees);
+}
+
 static int add_one_ref(const char *path, const struct object_id *oid,
                       int flag, void *cb_data)
 {
@@ -322,6 +369,9 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
        head_ref(add_one_ref, revs);
        other_head_refs(add_one_ref, revs);
 
+       /* rebase autostash and orig-head */
+       add_rebase_files(revs);
+
        /* Add all reflog info */
        if (mark_reflog)
                add_reflogs_to_pending(revs, 0);