From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Dec 2011 06:33:40 +0000 (-0800)
Subject: Merge branch 'jc/stream-to-pack'
X-Git-Tag: v1.7.9-rc0~58
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48b303675aa238c209e527feadcbb7ba1c025c97;p=git.git

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
---

48b303675aa238c209e527feadcbb7ba1c025c97
diff --cc environment.c
index 2c41d7d6c,31e42847b..c93b8f44d
--- a/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 pack.h
index a8d9b9f2f,cfb0f6976..aa6ee7d60
--- a/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 *);