diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 08:48:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 08:50:05 +0300 |
| commit | 5684200fe3572cf70b7260d1f835d801ff6dd14e (patch) | |
| tree | 4c869e76f4aee65f8bd131fda9aa5550ddf814c6 /notes-merge.h | |
| parent | 96ab6e0b30a490fc38bece66134d9ec0c25998ba (diff) | |
notes-merge.c: remove implicit dependency on the_index
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.h')
| -rw-r--r-- | notes-merge.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/notes-merge.h b/notes-merge.h index 6c74e9385b..99f9c709c5 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -6,6 +6,7 @@ struct commit; struct object_id; +struct repository; #define NOTES_MERGE_WORKTREE "NOTES_MERGE_WORKTREE" @@ -15,6 +16,7 @@ enum notes_merge_verbosity { }; struct notes_merge_options { + struct repository *repo; const char *local_ref; const char *remote_ref; struct strbuf commit_msg; @@ -23,7 +25,8 @@ struct notes_merge_options { unsigned has_worktree:1; }; -void init_notes_merge_options(struct notes_merge_options *o); +void init_notes_merge_options(struct repository *r, + struct notes_merge_options *o); /* * Merge notes from o->remote_ref into o->local_ref |