diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-24 15:29:12 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-24 11:55:06 -0800 |
| commit | f8adbec9feaa7a1ab9814db1115826e87033712e (patch) | |
| tree | 5049172d68705c068c5cc0ea40a3f6afcf443fa5 /builtin/merge-tree.c | |
| parent | 150fe065f71778a6591566d6fde65171569a4b7a (diff) | |
| download | git-f8adbec9feaa7a1ab9814db1115826e87033712e.tar.gz | |
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
By default, index compat macros are off from now on, because they
could hide the_index dependency.
Only those in builtin can use it.
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/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 70f6fc9167..53719e0b9d 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -1,3 +1,4 @@ +#define USE_THE_INDEX_COMPATIBILITY_MACROS #include "builtin.h" #include "tree-walk.h" #include "xdiff-interface.h" @@ -76,7 +77,8 @@ static void *result(struct merge_list *entry, unsigned long *size) their = NULL; if (entry) their = entry->blob; - return merge_blobs(&the_index, path, base, our, their, size); + return merge_blobs(the_repository->index, path, + base, our, their, size); } static void *origin(struct merge_list *entry, unsigned long *size) |