Ever since a64215b6cd ("object.h: stop depending on cache.h; make
cache.h depend on object.h", 2023-02-24), we have a few headers that
could have replaced their include of cache.h with an include of
object.h.  Make that change now.
Some C files had to start including cache.h after this change (or some
smaller header it had brought in), because the C files were depending
on things from cache.h but were only formerly implicitly getting
cache.h through one of these headers being modified in this patch.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
	
		
			
				
	
	
		
			61 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			61 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#ifndef BUNDLE_H
 | 
						|
#define BUNDLE_H
 | 
						|
 | 
						|
#include "strvec.h"
 | 
						|
#include "string-list.h"
 | 
						|
#include "list-objects-filter-options.h"
 | 
						|
 | 
						|
struct bundle_header {
 | 
						|
	unsigned version;
 | 
						|
	struct string_list prerequisites;
 | 
						|
	struct string_list references;
 | 
						|
	const struct git_hash_algo *hash_algo;
 | 
						|
	struct list_objects_filter_options filter;
 | 
						|
};
 | 
						|
 | 
						|
#define BUNDLE_HEADER_INIT \
 | 
						|
{ \
 | 
						|
	.prerequisites = STRING_LIST_INIT_DUP, \
 | 
						|
	.references = STRING_LIST_INIT_DUP, \
 | 
						|
	.filter = LIST_OBJECTS_FILTER_INIT, \
 | 
						|
}
 | 
						|
void bundle_header_init(struct bundle_header *header);
 | 
						|
void bundle_header_release(struct bundle_header *header);
 | 
						|
 | 
						|
int is_bundle(const char *path, int quiet);
 | 
						|
int read_bundle_header(const char *path, struct bundle_header *header);
 | 
						|
int read_bundle_header_fd(int fd, struct bundle_header *header,
 | 
						|
			  const char *report_path);
 | 
						|
int create_bundle(struct repository *r, const char *path,
 | 
						|
		  int argc, const char **argv, struct strvec *pack_options,
 | 
						|
		  int version);
 | 
						|
 | 
						|
enum verify_bundle_flags {
 | 
						|
	VERIFY_BUNDLE_VERBOSE = (1 << 0),
 | 
						|
	VERIFY_BUNDLE_QUIET = (1 << 1),
 | 
						|
};
 | 
						|
 | 
						|
int verify_bundle(struct repository *r, struct bundle_header *header,
 | 
						|
		  enum verify_bundle_flags flags);
 | 
						|
 | 
						|
/**
 | 
						|
 * Unbundle after reading the header with read_bundle_header().
 | 
						|
 *
 | 
						|
 * We'll invoke "git index-pack --stdin --fix-thin" for you on the
 | 
						|
 * provided `bundle_fd` from read_bundle_header().
 | 
						|
 *
 | 
						|
 * Provide "extra_index_pack_args" to pass any extra arguments
 | 
						|
 * (e.g. "-v" for verbose/progress), NULL otherwise. The provided
 | 
						|
 * "extra_index_pack_args" (if any) will be strvec_clear()'d for you.
 | 
						|
 *
 | 
						|
 * Before unbundling, this method will call verify_bundle() with the
 | 
						|
 * given 'flags'.
 | 
						|
 */
 | 
						|
int unbundle(struct repository *r, struct bundle_header *header,
 | 
						|
	     int bundle_fd, struct strvec *extra_index_pack_args,
 | 
						|
	     enum verify_bundle_flags flags);
 | 
						|
int list_bundle_refs(struct bundle_header *header,
 | 
						|
		int argc, const char **argv);
 | 
						|
 | 
						|
#endif
 |