implicit interactive rebase: don't run sequence editor

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 06eb42172099a39e6f181d0dd7eab581595d9756..3c3e0f06e78009ee3ee2d54333dfc4740b8792a9 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -19,6 +19,7 @@
 #include "packfile.h"
 #include "object-store.h"
 #include "run-command.h"
+#include "worktree.h"
 
 #define REACHABLE 0x0001
 #define SEEN      0x0002
@@ -36,8 +37,6 @@ static int check_strict;
 static int keep_cache_objects;
 static struct fsck_options fsck_walk_options = FSCK_OPTIONS_DEFAULT;
 static struct fsck_options fsck_obj_options = FSCK_OPTIONS_DEFAULT;
-static struct object_id head_oid;
-static const char *head_points_at;
 static int errors_found;
 static int write_lost_and_found;
 static int verbose;
@@ -446,7 +445,11 @@ static int fsck_handle_reflog_ent(struct object_id *ooid, struct object_id *noid
 static int fsck_handle_reflog(const char *logname, const struct object_id *oid,
                              int flag, void *cb_data)
 {
-       for_each_reflog_ent(logname, fsck_handle_reflog_ent, (void *)logname);
+       struct strbuf refname = STRBUF_INIT;
+
+       strbuf_worktree_ref(cb_data, &refname, logname);
+       for_each_reflog_ent(refname.buf, fsck_handle_reflog_ent, refname.buf);
+       strbuf_release(&refname);
        return 0;
 }
 
@@ -484,13 +487,34 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
        return 0;
 }
 
+static int fsck_head_link(const char *head_ref_name,
+                         const char **head_points_at,
+                         struct object_id *head_oid);
+
 static void get_default_heads(void)
 {
-       if (head_points_at && !is_null_oid(&head_oid))
-               fsck_handle_ref("HEAD", &head_oid, 0, NULL);
+       struct worktree **worktrees, **p;
+       const char *head_points_at;
+       struct object_id head_oid;
+
        for_each_rawref(fsck_handle_ref, NULL);
-       if (include_reflogs)
-               for_each_reflog(fsck_handle_reflog, NULL);
+
+       worktrees = get_worktrees(0);
+       for (p = worktrees; *p; p++) {
+               struct worktree *wt = *p;
+               struct strbuf ref = STRBUF_INIT;
+
+               strbuf_worktree_ref(wt, &ref, "HEAD");
+               fsck_head_link(ref.buf, &head_points_at, &head_oid);
+               if (head_points_at && !is_null_oid(&head_oid))
+                       fsck_handle_ref(ref.buf, &head_oid, 0, NULL);
+               strbuf_release(&ref);
+
+               if (include_reflogs)
+                       refs_for_each_reflog(get_worktree_ref_store(wt),
+                                            fsck_handle_reflog, wt);
+       }
+       free_worktrees(worktrees);
 
        /*
         * Not having any default heads isn't really fatal, but
@@ -579,33 +603,36 @@ static void fsck_object_dir(const char *path)
        stop_progress(&progress);
 }
 
-static int fsck_head_link(void)
+static int fsck_head_link(const char *head_ref_name,
+                         const char **head_points_at,
+                         struct object_id *head_oid)
 {
        int null_is_error = 0;
 
        if (verbose)
-               fprintf(stderr, "Checking HEAD link\n");
+               fprintf(stderr, "Checking %s link\n", head_ref_name);
 
-       head_points_at = resolve_ref_unsafe("HEAD", 0, &head_oid, NULL);
-       if (!head_points_at) {
+       *head_points_at = resolve_ref_unsafe(head_ref_name, 0, head_oid, NULL);
+       if (!*head_points_at) {
                errors_found |= ERROR_REFS;
-               return error("Invalid HEAD");
+               return error("Invalid %s", head_ref_name);
        }
-       if (!strcmp(head_points_at, "HEAD"))
+       if (!strcmp(*head_points_at, head_ref_name))
                /* detached HEAD */
                null_is_error = 1;
-       else if (!starts_with(head_points_at, "refs/heads/")) {
+       else if (!starts_with(*head_points_at, "refs/heads/")) {
                errors_found |= ERROR_REFS;
-               return error("HEAD points to something strange (%s)",
-                            head_points_at);
+               return error("%s points to something strange (%s)",
+                            head_ref_name, *head_points_at);
        }
-       if (is_null_oid(&head_oid)) {
+       if (is_null_oid(head_oid)) {
                if (null_is_error) {
                        errors_found |= ERROR_REFS;
-                       return error("HEAD: detached HEAD points at nothing");
+                       return error("%s: detached HEAD points at nothing",
+                                    head_ref_name);
                }
-               fprintf(stderr, "notice: HEAD points to an unborn branch (%s)\n",
-                       head_points_at + 11);
+               fprintf(stderr, "notice: %s points to an unborn branch (%s)\n",
+                       head_ref_name, *head_points_at + 11);
        }
        return 0;
 }
@@ -720,7 +747,6 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 
        git_config(fsck_config, NULL);
 
-       fsck_head_link();
        if (connectivity_only) {
                for_each_loose_object(mark_loose_for_connectivity, NULL, 0);
                for_each_packed_object(mark_packed_for_connectivity, NULL, 0);