diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:22 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:23 (GMT) |
commit | 7589e63648bf5224e186990931b1491f36e10a4b (patch) | |
tree | dfd3004e735b69ae91dc08ac4f742f1cb84eae5d /notes-merge.c | |
parent | e52c6bbd131f1f4f17b95e28d12ead0c81a8e890 (diff) | |
parent | f8adbec9feaa7a1ab9814db1115826e87033712e (diff) | |
download | git-7589e63648bf5224e186990931b1491f36e10a4b.zip git-7589e63648bf5224e186990931b1491f36e10a4b.tar.gz git-7589e63648bf5224e186990931b1491f36e10a4b.tar.bz2 |
Merge branch 'nd/the-index-final'
The assumption to work on the single "in-core index" instance has
been reduced from the library-ish part of the codebase.
* nd/the-index-final:
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
read-cache.c: remove the_* from index_has_changes()
merge-recursive.c: remove implicit dependency on the_repository
merge-recursive.c: remove implicit dependency on the_index
sha1-name.c: remove implicit dependency on the_index
read-cache.c: replace update_index_if_able with repo_&
read-cache.c: kill read_index()
checkout: avoid the_index when possible
repository.c: replace hold_locked_index() with repo_hold_locked_index()
notes-utils.c: remove the_repository references
grep: use grep_opt->repo instead of explict repo argument
Diffstat (limited to 'notes-merge.c')
-rw-r--r-- | notes-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/notes-merge.c b/notes-merge.c index 72688d3..280aa8e 100644 --- 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); - 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); } @@ -724,7 +724,7 @@ int notes_merge_commit(struct notes_merge_options *o, 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) |