diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-24 08:29:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-24 19:55:06 (GMT) |
| commit | f8adbec9feaa7a1ab9814db1115826e87033712e (patch) | |
| tree | 5049172d68705c068c5cc0ea40a3f6afcf443fa5 /builtin/merge.c | |
| parent | 150fe065f71778a6591566d6fde65171569a4b7a (diff) | |
| download | git-f8adbec9feaa7a1ab9814db1115826e87033712e.zip git-f8adbec9feaa7a1ab9814db1115826e87033712e.tar.gz git-f8adbec9feaa7a1ab9814db1115826e87033712e.tar.bz2 | |
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.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index bc1aecf..e47d77b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -6,6 +6,7 @@ * Based on git-merge.sh by Junio C Hamano. */ +#define USE_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" #include "config.h" #include "parse-options.h" |