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-ours.c | |
| parent | read-cache.c: remove the_* from index_has_changes() (diff) | |
| download | tgif-f8adbec9feaa7a1ab9814db1115826e87033712e.tar.xz | |
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-ours.c')
| -rw-r--r-- | builtin/merge-ours.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 0b07263415..4594507420 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -7,6 +7,7 @@ * * Pretend we resolved the heads, but declare our tree trumps everybody else. */ +#define USE_THE_INDEX_COMPATIBILITY_MACROS #include "git-compat-util.h" #include "builtin.h" #include "diff.h" |