diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 05:13:29 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 23:13:04 +0300 |
commit | 0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763 (patch) | |
tree | c1c4b356f5b889b13c436bb4b6a6adb301c587f1 /builtin/am.c | |
parent | 3a7a698e93e1031c322ab20c0e336e205514c058 (diff) |
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/am.c')
-rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 901dc55078c..611712dc95c 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1545,7 +1545,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa * changes. */ - init_merge_options(&o); + init_merge_options(&o, the_repository); o.branch1 = "HEAD"; their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg); |