diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:23 -0800 |
| commit | 7589e63648bf5224e186990931b1491f36e10a4b (patch) | |
| tree | dfd3004e735b69ae91dc08ac4f742f1cb84eae5d /builtin/difftool.c | |
| parent | Merge branch 'js/rebase-am' (diff) | |
| parent | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch (diff) | |
| download | tgif-7589e63648bf5224e186990931b1491f36e10a4b.tar.xz | |
Merge branch 'nd/the-index-final'
The assumption to work on the single "in-core index" instance has
been reduced from the library-ish part of the codebase.
* nd/the-index-final:
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
read-cache.c: remove the_* from index_has_changes()
merge-recursive.c: remove implicit dependency on the_repository
merge-recursive.c: remove implicit dependency on the_index
sha1-name.c: remove implicit dependency on the_index
read-cache.c: replace update_index_if_able with repo_&
read-cache.c: kill read_index()
checkout: avoid the_index when possible
repository.c: replace hold_locked_index() with repo_hold_locked_index()
notes-utils.c: remove the_repository references
grep: use grep_opt->repo instead of explict repo argument
Diffstat (limited to 'builtin/difftool.c')
| -rw-r--r-- | builtin/difftool.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 71318c26e1..a3ea60ea71 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -11,6 +11,7 @@ * * Copyright (C) 2016 Johannes Schindelin */ +#define USE_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" #include "config.h" #include "builtin.h" |