diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 09:13:29 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 12:13:04 -0800 |
| commit | 0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763 (patch) | |
| tree | c1c4b356f5b889b13c436bb4b6a6adb301c587f1 /builtin/checkout.c | |
| parent | 3a7a698e93e1031c322ab20c0e336e205514c058 (diff) | |
| download | git-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.tar.gz | |
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 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 1b672a9fd9..a95ba2c6dc 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -670,7 +670,7 @@ static int merge_working_tree(const struct checkout_opts *opts, * a pain; plumb in an option to set * o.renormalize? */ - init_merge_options(&o); + init_merge_options(&o, the_repository); o.verbosity = 0; work = write_tree_from_memory(&o); |