summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2014-10-01 12:28:42 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-01 13:56:14 -0700
commit697cc8efd944a32ca472337cd6640004c474b788 (patch)
treea8999149e7e907e2b65b6617bd5d45d6c675a72e /builtin/diff.c
parenthold_locked_index(): move from lockfile.c to read-cache.c (diff)
downloadtgif-697cc8efd944a32ca472337cd6640004c474b788.tar.xz
lockfile.h: extract new header file for the functions in lockfile.c
Move the interface declaration for the functions in lockfile.c from cache.h to a new file, lockfile.h. Add #includes where necessary (and remove some redundant includes of cache.h by files that already include builtin.h). Move the documentation of the lock_file state diagram from lockfile.c to the new header file. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index 0f247d2400..4326fa56bf 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -4,6 +4,7 @@
* Copyright (c) 2006 Junio C Hamano
*/
#include "cache.h"
+#include "lockfile.h"
#include "color.h"
#include "commit.h"
#include "blob.h"