diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-10-01 12:28:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-01 13:56:14 -0700 |
| commit | 697cc8efd944a32ca472337cd6640004c474b788 (patch) | |
| tree | a8999149e7e907e2b65b6617bd5d45d6c675a72e /merge-recursive.c | |
| parent | 216aab1e3d8eef088dc9785febce24a110e9f835 (diff) | |
| download | git-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-recursive.c')
| -rw-r--r-- | merge-recursive.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 8ad4be897d..4b0884b7bb 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -5,6 +5,7 @@ */ #include "advice.h" #include "cache.h" +#include "lockfile.h" #include "cache-tree.h" #include "commit.h" #include "blob.h" |