summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-15 15:08:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-15 15:08:26 -0700
commit88f240734fb2df7d4fe0a26f86434049429a3a5e (patch)
tree5a53aac4559c3b0ffd4b0a573b4e83bf1e5a355c
parentMerge branch 'jk/banned-function' (diff)
parentpackfile: ensure that enum object_type is defined (diff)
downloadtgif-88f240734fb2df7d4fe0a26f86434049429a3a5e.tar.xz
Merge branch 'bb/redecl-enum-fix'
Compilation fix. * bb/redecl-enum-fix: packfile: ensure that enum object_type is defined
-rw-r--r--packfile.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/packfile.h b/packfile.h
index cc7eaffe1b..fa36c473ad 100644
--- a/packfile.h
+++ b/packfile.h
@@ -1,12 +1,12 @@
#ifndef PACKFILE_H
#define PACKFILE_H
+#include "cache.h"
#include "oidset.h"
/* in object-store.h */
struct packed_git;
struct object_info;
-enum object_type;
/*
* Generate the filename to be used for a pack file with checksum "sha1" and