summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-06 16:42:52 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-06 16:42:52 -0700
commit9941afc051d953ee5e8fd9a8a27c5cd659ef9552 (patch)
tree1c2e8296f1cb0e97e341c220a5246bd3154ced7a /Makefile
parentMerge branch 'js/alias' (diff)
parentref-log: style fixes. (diff)
downloadtgif-9941afc051d953ee5e8fd9a8a27c5cd659ef9552.tar.xz
Merge branch 'jc/lockfile'
* jc/lockfile: ref-log: style fixes. refs.c: convert it to use lockfile interface. Make index file locking code reusable to others.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f802043aa9..265a716704 100644
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@ DIFF_OBJS = \
LIB_OBJS = \
blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
- date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
+ date.o diff-delta.o entry.o exec_cmd.o ident.o lockfile.o \
object.o pack-check.o patch-delta.o path.o pkt-line.o \
quote.o read-cache.o refs.o run-command.o dir.o \
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \