From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Nov 2007 08:11:17 +0000 (-0700)
Subject: Merge branch 'np/pack'
X-Git-Tag: v1.5.4-rc0~275
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e091653951ae516a923338874bfe550894cd1bc9;p=git.git

Merge branch 'np/pack'

* np/pack:
  pack-objects: get rid of an ugly cast
  make the pack index version configurable

Conflicts:

	builtin-pack-objects.c
---

e091653951ae516a923338874bfe550894cd1bc9
diff --cc builtin-pack-objects.c
index 25ec65d0f,d0ca165c9..545ece5da
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@@ -598,8 -606,8 +598,8 @@@ static void write_pack_file(void
  	uint32_t nr_remaining = nr_result;
  
  	if (do_progress)
 -		start_progress(&progress_state, "Writing %u objects...", "", nr_result);
 +		progress_state = start_progress("Writing objects", nr_result);
- 	written_list = xmalloc(nr_objects * sizeof(struct object_entry *));
+ 	written_list = xmalloc(nr_objects * sizeof(*written_list));
  
  	do {
  		unsigned char sha1[20];
diff --cc index-pack.c
index 61ea7621b,c0bb78a8e..715a5bb7a
--- a/index-pack.c
+++ b/index-pack.c
@@@ -693,8 -704,10 +704,10 @@@ int main(int argc, char **argv
  	struct pack_idx_entry **idx_objects;
  	unsigned char sha1[20];
  
+ 	git_config(git_index_pack_config);
+ 
  	for (i = 1; i < argc; i++) {
 -		const char *arg = argv[i];
 +		char *arg = argv[i];
  
  		if (*arg == '-') {
  			if (!strcmp(arg, "--stdin")) {