summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-09 05:33:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-09 05:33:08 (GMT)
commitdd75d07899653258587b854ce0e3f7f1b90610cf (patch)
treed95fd2d3ec348a0304717f58f0b4c8931908e760 /Makefile
parent3ecaa3b6a5f707617ea610d727c696f43f8b2f0b (diff)
parentb3373982667dc983b8dacf33861d25b20bafb995 (diff)
downloadgit-dd75d07899653258587b854ce0e3f7f1b90610cf.zip
git-dd75d07899653258587b854ce0e3f7f1b90610cf.tar.gz
git-dd75d07899653258587b854ce0e3f7f1b90610cf.tar.bz2
Merge branch 'jk/cached-textconv'
* jk/cached-textconv: diff: avoid useless filespec population diff: cache textconv output textconv: refactor calls to run_textconv introduce notes-cache interface make commit_tree a library function
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index eb1d162..4f7224a 100644
--- a/Makefile
+++ b/Makefile
@@ -486,6 +486,7 @@ LIB_H += log-tree.h
LIB_H += mailmap.h
LIB_H += merge-recursive.h
LIB_H += notes.h
+LIB_H += notes-cache.h
LIB_H += object.h
LIB_H += pack.h
LIB_H += pack-refs.h
@@ -575,6 +576,7 @@ LIB_OBJS += merge-file.o
LIB_OBJS += merge-recursive.o
LIB_OBJS += name-hash.o
LIB_OBJS += notes.o
+LIB_OBJS += notes-cache.o
LIB_OBJS += object.o
LIB_OBJS += pack-check.o
LIB_OBJS += pack-refs.o