diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 05:48:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 05:50:05 (GMT) |
| commit | 5684200fe3572cf70b7260d1f835d801ff6dd14e (patch) | |
| tree | 4c869e76f4aee65f8bd131fda9aa5550ddf814c6 /builtin/notes.c | |
| parent | 96ab6e0b30a490fc38bece66134d9ec0c25998ba (diff) | |
| download | git-5684200fe3572cf70b7260d1f835d801ff6dd14e.zip git-5684200fe3572cf70b7260d1f835d801ff6dd14e.tar.gz git-5684200fe3572cf70b7260d1f835d801ff6dd14e.tar.bz2 | |
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 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index c05cd00..15a6c78 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -808,7 +808,7 @@ static int merge(int argc, const char **argv, const char *prefix) usage_with_options(git_notes_merge_usage, options); } - init_notes_merge_options(&o); + init_notes_merge_options(the_repository, &o); o.verbosity = verbosity + NOTES_MERGE_VERBOSITY_DEFAULT; if (do_abort) |