summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-10-01 12:28:42 +0200
committerJunio C Hamano <gitster@pobox.com>2014-10-01 13:56:14 -0700
commit697cc8efd944a32ca472337cd6640004c474b788 (patch)
treea8999149e7e907e2b65b6617bd5d45d6c675a72e /merge.c
parent216aab1e3d8eef088dc9785febce24a110e9f835 (diff)
downloadgit-697cc8efd944a32ca472337cd6640004c474b788.tar.gz
lockfile.h: extract new header file for the functions in lockfile.cmh/lockfile
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 'merge.c')
-rw-r--r--merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge.c b/merge.c
index 74ced7f70b..fcff632bd6 100644
--- a/merge.c
+++ b/merge.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "lockfile.h"
#include "commit.h"
#include "run-command.h"
#include "resolve-undo.h"