Merge branch 'jc/stream-to-pack'

* jc/stream-to-pack:
  bulk-checkin: replace fast-import based implementation
  csum-file: introduce sha1file_checkpoint
  finish_tmp_packfile(): a helper function
  create_tmp_packfile(): a helper function
  write_pack_header(): a helper function

Conflicts:
	pack.h

diff --cc Makefile
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge

diff --cc environment.c
index 2c41d7d6cb66832197d69d49065a3d5b3bb2e5da,31e42847b185a6f9f51cff60160187f405b01b17..c93b8f44df0171a0f923546813d00e8b8e837af1
--- 1/environment.c
--- 2/environment.c
+++ b/environment.c
@@@ -60,8 -59,8 +60,9 @@@ enum object_creation_mode object_creati
  char *notes_ref_name;
  int grafts_replace_parents = 1;
  int core_apply_sparse_checkout;
 +int merge_log_config = -1;
  struct startup_info *startup_info;
+ unsigned long pack_size_limit_cfg;
  
  /* Parallel index stat data preload? */
  int core_preload_index = 0;

diff --cc fast-import.c
Simple merge

diff --cc pack-write.c
Simple merge

diff --cc pack.h
index a8d9b9f2fcc41bf56007cd48dcfcb94a7e00d3ca,cfb0f6976d92b5b5c84c770deeec6129613d3219..aa6ee7d606f1d5336bff9a3067b44057c362e788
--- 1/pack.h
--- 2/pack.h
+++ b/pack.h
@@@ -78,7 -74,8 +79,8 @@@ typedef int (*verify_fn)(const unsigne
  extern const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects, int nr_objects, const struct pack_idx_option *, unsigned char *sha1);
  extern int check_pack_crc(struct packed_git *p, struct pack_window **w_curs, off_t offset, off_t len, unsigned int nr);
  extern int verify_pack_index(struct packed_git *);
 -extern int verify_pack(struct packed_git *);
 +extern int verify_pack(struct packed_git *, verify_fn fn, struct progress *, uint32_t);
+ extern off_t write_pack_header(struct sha1file *f, uint32_t);
  extern void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t, unsigned char *, off_t);
  extern char *index_pack_lockfile(int fd);
  extern int encode_in_pack_object_header(enum object_type, uintmax_t, unsigned char *);

diff --cc sha1_file.c
Simple merge