notes-utils.c: remove the_repository references

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/am.c b/builtin/am.c
index 95370313b66daad8cabcc3b855136e29afb3133f..d32044545d7b10157042045161b839344cbbc8d8 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -527,7 +527,7 @@ static int copy_notes_for_rebase(const struct am_state *state)
        }
 
 finish:
        }
 
 finish:

-       finish_copy_notes_for_rewrite(c, msg);
+       finish_copy_notes_for_rewrite(the_repository, c, msg);

        fclose(fp);
        strbuf_release(&sb);
        return ret;
        fclose(fp);
        strbuf_release(&sb);
        return ret;

diff --git a/builtin/commit.c b/builtin/commit.c
index 004b816635bf1628bfe7697f737a22cbcd27622b..e29fb5e3eb003e21ec8b1f70bc09641f79ba2126 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1674,7 +1674,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
        run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
        run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
        if (amend && !no_post_rewrite) {
        run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
        run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
        if (amend && !no_post_rewrite) {

-               commit_post_rewrite(current_head, &oid);
+               commit_post_rewrite(the_repository, current_head, &oid);

        }
        if (!quiet) {
                unsigned int flags = 0;
        }
        if (!quiet) {
                unsigned int flags = 0;

diff --git a/builtin/notes.c b/builtin/notes.c
index 4996a670f71333de09e1a0311fde85d6985c9c91..02e97f55c5a01be452bb3eaa97ec396f58e2ed99 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -330,10 +330,10 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
        }
 
        if (!rewrite_cmd) {
        }
 
        if (!rewrite_cmd) {

-               commit_notes(t, msg);
+               commit_notes(the_repository, t, msg);

                free_notes(t);
        } else {
                free_notes(t);
        } else {

-               finish_copy_notes_for_rewrite(c, msg);
+               finish_copy_notes_for_rewrite(the_repository, c, msg);

        }
        strbuf_release(&buf);
        return ret;
        }
        strbuf_release(&buf);
        return ret;


@@ -469,12 +469,14 @@ static int add(int argc, const char **argv, const char *prefix)
                write_note_data(&d, &new_note);
                if (add_note(t, &object, &new_note, combine_notes_overwrite))
                        BUG("combine_notes_overwrite failed");
                write_note_data(&d, &new_note);
                if (add_note(t, &object, &new_note, combine_notes_overwrite))
                        BUG("combine_notes_overwrite failed");

-               commit_notes(t, "Notes added by 'git notes add'");
+               commit_notes(the_repository, t,
+                            "Notes added by 'git notes add'");

        } else {
                fprintf(stderr, _("Removing note for object %s\n"),
                        oid_to_hex(&object));
                remove_note(t, object.hash);
        } else {
                fprintf(stderr, _("Removing note for object %s\n"),
                        oid_to_hex(&object));
                remove_note(t, object.hash);

-               commit_notes(t, "Notes removed by 'git notes add'");
+               commit_notes(the_repository, t,
+                            "Notes removed by 'git notes add'");

        }
 
        free_note_data(&d);
        }
 
        free_note_data(&d);


@@ -552,7 +554,8 @@ static int copy(int argc, const char **argv, const char *prefix)
 
        if (add_note(t, &object, from_note, combine_notes_overwrite))
                BUG("combine_notes_overwrite failed");
 
        if (add_note(t, &object, from_note, combine_notes_overwrite))
                BUG("combine_notes_overwrite failed");

-       commit_notes(t, "Notes added by 'git notes copy'");
+       commit_notes(the_repository, t,
+                    "Notes added by 'git notes copy'");

 out:
        free_notes(t);
        return retval;
 out:
        free_notes(t);
        return retval;


@@ -636,7 +639,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
                remove_note(t, object.hash);
                logmsg = xstrfmt("Notes removed by 'git notes %s'", argv[0]);
        }
                remove_note(t, object.hash);
                logmsg = xstrfmt("Notes removed by 'git notes %s'", argv[0]);
        }

-       commit_notes(t, logmsg);
+       commit_notes(the_repository, t, logmsg);

 
        free(logmsg);
        free_note_data(&d);
 
        free(logmsg);
        free_note_data(&d);


@@ -937,7 +940,8 @@ static int remove_cmd(int argc, const char **argv, const char *prefix)
                strbuf_release(&sb);
        }
        if (!retval)
                strbuf_release(&sb);
        }
        if (!retval)

-               commit_notes(t, "Notes removed by 'git notes remove'");
+               commit_notes(the_repository, t,
+                            "Notes removed by 'git notes remove'");

        free_notes(t);
        return retval;
 }
        free_notes(t);
        return retval;
 }


@@ -965,7 +969,8 @@ static int prune(int argc, const char **argv, const char *prefix)
        prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) |
                (show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) );
        if (!show_only)
        prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) |
                (show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) );
        if (!show_only)

-               commit_notes(t, "Notes removed by 'git notes prune'");
+               commit_notes(the_repository, t,
+                            "Notes removed by 'git notes prune'");

        free_notes(t);
        return 0;
 }
        free_notes(t);
        return 0;
 }

diff --git a/notes-merge.c b/notes-merge.c
index 72688d301b7dd41ed1aa8ab5d3e5e61a6f4054c5..280aa8e6c1b04136d4718b970adca19a1a9eb9cf 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -649,7 +649,7 @@ int notes_merge(struct notes_merge_options *o,
                struct commit_list *parents = NULL;
                commit_list_insert(remote, &parents); /* LIFO order */
                commit_list_insert(local, &parents);
                struct commit_list *parents = NULL;
                commit_list_insert(remote, &parents); /* LIFO order */
                commit_list_insert(local, &parents);

-               create_notes_commit(local_tree, parents, o->commit_msg.buf,
+               create_notes_commit(o->repo, local_tree, parents, o->commit_msg.buf,

                                    o->commit_msg.len, result_oid);
        }
 
                                    o->commit_msg.len, result_oid);
        }
 


@@ -724,7 +724,7 @@ int notes_merge_commit(struct notes_merge_options *o,
                strbuf_setlen(&path, baselen);
        }
 
                strbuf_setlen(&path, baselen);
        }
 

-       create_notes_commit(partial_tree, partial_commit->parents, msg,
+       create_notes_commit(o->repo, partial_tree, partial_commit->parents, msg,

                            strlen(msg), result_oid);
        unuse_commit_buffer(partial_commit, buffer);
        if (o->verbosity >= 4)
                            strlen(msg), result_oid);
        unuse_commit_buffer(partial_commit, buffer);
        if (o->verbosity >= 4)

diff --git a/notes-utils.c b/notes-utils.c
index 14ea03178e9c44c8c8a05fb70ab038df5ad1b5f8..a8194106987388a590b10e246327f49fd550f448 100644 (file)
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -5,7 +5,9 @@
 #include "notes-utils.h"
 #include "repository.h"
 
 #include "notes-utils.h"
 #include "repository.h"
 

-void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
+void create_notes_commit(struct repository *r,
+                        struct notes_tree *t,
+                        struct commit_list *parents,

                         const char *msg, size_t msg_len,
                         struct object_id *result_oid)
 {
                         const char *msg, size_t msg_len,
                         struct object_id *result_oid)
 {


@@ -20,8 +22,7 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
                /* Deduce parent commit from t->ref */
                struct object_id parent_oid;
                if (!read_ref(t->ref, &parent_oid)) {
                /* Deduce parent commit from t->ref */
                struct object_id parent_oid;
                if (!read_ref(t->ref, &parent_oid)) {

-                       struct commit *parent = lookup_commit(the_repository,
-                                                             &parent_oid);
+                       struct commit *parent = lookup_commit(r, &parent_oid);

                        if (parse_commit(parent))
                                die("Failed to find/parse commit %s", t->ref);
                        commit_list_insert(parent, &parents);
                        if (parse_commit(parent))
                                die("Failed to find/parse commit %s", t->ref);
                        commit_list_insert(parent, &parents);


@@ -34,7 +35,7 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
                die("Failed to commit notes tree to database");
 }
 
                die("Failed to commit notes tree to database");
 }
 

-void commit_notes(struct notes_tree *t, const char *msg)
+void commit_notes(struct repository *r, struct notes_tree *t, const char *msg)

 {
        struct strbuf buf = STRBUF_INIT;
        struct object_id commit_oid;
 {
        struct strbuf buf = STRBUF_INIT;
        struct object_id commit_oid;


@@ -50,7 +51,7 @@ void commit_notes(struct notes_tree *t, const char *msg)
        strbuf_addstr(&buf, msg);
        strbuf_complete_line(&buf);
 
        strbuf_addstr(&buf, msg);
        strbuf_complete_line(&buf);
 

-       create_notes_commit(t, NULL, buf.buf, buf.len, &commit_oid);
+       create_notes_commit(r, t, NULL, buf.buf, buf.len, &commit_oid);

        strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
        update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0,
                   UPDATE_REFS_DIE_ON_ERR);
        strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
        update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0,
                   UPDATE_REFS_DIE_ON_ERR);


@@ -171,11 +172,13 @@ int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
        return ret;
 }
 
        return ret;
 }
 

-void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c, const char *msg)
+void finish_copy_notes_for_rewrite(struct repository *r,
+                                  struct notes_rewrite_cfg *c,
+                                  const char *msg)

 {
        int i;
        for (i = 0; c->trees[i]; i++) {
 {
        int i;
        for (i = 0; c->trees[i]; i++) {

-               commit_notes(c->trees[i], msg);
+               commit_notes(r, c->trees[i], msg);

                free_notes(c->trees[i]);
        }
        free(c->trees);
                free_notes(c->trees[i]);
        }
        free(c->trees);

diff --git a/notes-utils.h b/notes-utils.h
index 54083065283f681d8354af633b805a4896c8b036..d9b3c09eaf09819f9444cfcf68ca5443aa918b78 100644 (file)
--- a/notes-utils.h
+++ b/notes-utils.h
@@ -5,6 +5,7 @@
 
 struct commit_list;
 struct object_id;
 
 struct commit_list;
 struct object_id;

+struct repository;

 
 /*
  * Create new notes commit from the given notes tree
 
 /*
  * Create new notes commit from the given notes tree


@@ -17,11 +18,13 @@ struct object_id;
  *
  * The resulting commit SHA1 is stored in result_sha1.
  */
  *
  * The resulting commit SHA1 is stored in result_sha1.
  */

-void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
+void create_notes_commit(struct repository *r,
+                        struct notes_tree *t,
+                        struct commit_list *parents,

                         const char *msg, size_t msg_len,
                         struct object_id *result_oid);
 
                         const char *msg, size_t msg_len,
                         struct object_id *result_oid);
 

-void commit_notes(struct notes_tree *t, const char *msg);
+void commit_notes(struct repository *r, struct notes_tree *t, const char *msg);

 
 enum notes_merge_strategy {
                NOTES_MERGE_RESOLVE_MANUAL = 0,
 
 enum notes_merge_strategy {
                NOTES_MERGE_RESOLVE_MANUAL = 0,


@@ -45,6 +48,8 @@ int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s);
 struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
 int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
                          const struct object_id *from_obj, const struct object_id *to_obj);
 struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
 int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
                          const struct object_id *from_obj, const struct object_id *to_obj);

-void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c, const char *msg);
+void finish_copy_notes_for_rewrite(struct repository *r,
+                                  struct notes_rewrite_cfg *c,
+                                  const char *msg);

 
 #endif
 
 #endif

diff --git a/sequencer.c b/sequencer.c
index b68bca0bef927f0ebb2d8762f658946be7107fcb..1a92a5d678e2a846c3fb36d1ed169ac439ba25f5 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1115,7 +1115,8 @@ static int run_rewrite_hook(const struct object_id *oldoid,
        return finish_command(&proc);
 }
 
        return finish_command(&proc);
 }
 

-void commit_post_rewrite(const struct commit *old_head,
+void commit_post_rewrite(struct repository *r,
+                        const struct commit *old_head,

                         const struct object_id *new_head)
 {
        struct notes_rewrite_cfg *cfg;
                         const struct object_id *new_head)
 {
        struct notes_rewrite_cfg *cfg;


@@ -1124,7 +1125,7 @@ void commit_post_rewrite(const struct commit *old_head,
        if (cfg) {
                /* we are amending, so old_head is not NULL */
                copy_note_for_rewrite(cfg, &old_head->object.oid, new_head);
        if (cfg) {
                /* we are amending, so old_head is not NULL */
                copy_note_for_rewrite(cfg, &old_head->object.oid, new_head);

-               finish_copy_notes_for_rewrite(cfg, "Notes added by 'git commit --amend'");
+               finish_copy_notes_for_rewrite(r, cfg, "Notes added by 'git commit --amend'");

        }
        run_rewrite_hook(&old_head->object.oid, new_head);
 }
        }
        run_rewrite_hook(&old_head->object.oid, new_head);
 }


@@ -1405,7 +1406,7 @@ static int try_to_commit(struct repository *r,
        }
 
        if (flags & AMEND_MSG)
        }
 
        if (flags & AMEND_MSG)

-               commit_post_rewrite(current_head, oid);
+               commit_post_rewrite(r, current_head, oid);

 
 out:
        free_commit_extra_headers(extra);
 
 out:
        free_commit_extra_headers(extra);

diff --git a/sequencer.h b/sequencer.h
index 9d83f0f3e90313be990439972845e9d4f2bc1804..2caecd550b869945ceb020929fdb5fc06728d901 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -124,7 +124,8 @@ int update_head_with_reflog(const struct commit *old_head,
                            const struct object_id *new_head,
                            const char *action, const struct strbuf *msg,
                            struct strbuf *err);
                            const struct object_id *new_head,
                            const char *action, const struct strbuf *msg,
                            struct strbuf *err);

-void commit_post_rewrite(const struct commit *current_head,
+void commit_post_rewrite(struct repository *r,
+                        const struct commit *current_head,

                         const struct object_id *new_head);
 
 int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);
                         const struct object_id *new_head);
 
 int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);