diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 02:13:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 20:13:04 (GMT) |
| commit | 0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763 (patch) | |
| tree | c1c4b356f5b889b13c436bb4b6a6adb301c587f1 /sequencer.c | |
| parent | 3a7a698e93e1031c322ab20c0e336e205514c058 (diff) | |
| download | git-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.zip git-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.tar.gz git-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.tar.bz2 | |
merge-recursive.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 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index c2c9cc7..cede6ea 100644 --- a/sequencer.c +++ b/sequencer.c @@ -545,7 +545,7 @@ static int do_recursive_merge(struct repository *r, repo_read_index(r); - init_merge_options(&o); + init_merge_options(&o, r); o.ancestor = base ? base_label : "(empty tree)"; o.branch1 = "HEAD"; o.branch2 = next ? next_label : "(empty tree)"; @@ -3300,7 +3300,7 @@ static int do_merge(struct repository *r, free_commit_list(bases); repo_read_index(r); - init_merge_options(&o); + init_merge_options(&o, r); o.branch1 = "HEAD"; o.branch2 = ref_name.buf; o.buffer_output = 2; |