diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 02:13:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 20:13:04 (GMT) |
| commit | 1d18d7581cf1ce45314b7ed58e52d5cc73b2e7a7 (patch) | |
| tree | f01d372d987558abf669453dbeebea7a7e220107 /notes-merge.c | |
| parent | dba093ddc0341a85f576bbd5227d393a820d930a (diff) | |
| download | git-1d18d7581cf1ce45314b7ed58e52d5cc73b2e7a7.zip git-1d18d7581cf1ce45314b7ed58e52d5cc73b2e7a7.tar.gz git-1d18d7581cf1ce45314b7ed58e52d5cc73b2e7a7.tar.bz2 | |
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>
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) |