summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-01-24 15:29:12 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-24 11:55:06 -0800
commitf8adbec9feaa7a1ab9814db1115826e87033712e (patch)
tree5049172d68705c068c5cc0ea40a3f6afcf443fa5 /builtin/pull.c
parentread-cache.c: remove the_* from index_has_changes() (diff)
downloadtgif-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/pull.c')
-rw-r--r--builtin/pull.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 74808b9455..701d1473dc 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -5,6 +5,7 @@
*
* Fetch one or more remote refs and merge it/them into the current HEAD.
*/
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h"
#include "config.h"
#include "builtin.h"