From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:28:13 +0000 (-0700)
Subject: Merge branch 'jk/index-pack-report-missing'
X-Git-Tag: v2.1.0-rc0~159
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a0460132a740d8ff0c08dcbd54520f1b795298b9?hp=-c

Merge branch 'jk/index-pack-report-missing'

* jk/index-pack-report-missing:
index-pack: distinguish missing objects from type errors
---

a0460132a740d8ff0c08dcbd54520f1b795298b9
diff --combined builtin/index-pack.c
index 87d8dd81cc,7878836eb4..18f57de58b
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@@ -40,13 -40,17 +40,13 @@@ struct base_data 
  	int ofs_first, ofs_last;
  };
  
 -#if !defined(NO_PTHREADS) && defined(NO_THREAD_SAFE_PREAD)
 -/* pread() emulation is not thread-safe. Disable threading. */
 -#define NO_PTHREADS
 -#endif
 -
  struct thread_local {
  #ifndef NO_PTHREADS
  	pthread_t thread;
  #endif
  	struct base_data *base_cache;
  	size_t base_cache_used;
 +	int pack_fd;
  };
  
  /*
@@@ -87,8 -91,7 +87,8 @@@ static off_t consumed_bytes
  static unsigned deepest_delta;
  static git_SHA_CTX input_ctx;
  static uint32_t input_crc32;
 -static int input_fd, output_fd, pack_fd;
 +static int input_fd, output_fd;
 +static const char *curr_pack;
  
  #ifndef NO_PTHREADS
  
@@@ -131,7 -134,6 +131,7 @@@ static inline void unlock_mutex(pthread
   */
  static void init_thread(void)
  {
 +	int i;
  	init_recursive_mutex(&read_mutex);
  	pthread_mutex_init(&counter_mutex, NULL);
  	pthread_mutex_init(&work_mutex, NULL);
@@@ -139,18 -141,11 +139,18 @@@
  		pthread_mutex_init(&deepest_delta_mutex, NULL);
  	pthread_key_create(&key, NULL);
  	thread_data = xcalloc(nr_threads, sizeof(*thread_data));
 +	for (i = 0; i < nr_threads; i++) {
 +		thread_data[i].pack_fd = open(curr_pack, O_RDONLY);
 +		if (thread_data[i].pack_fd == -1)
 +			die_errno(_("unable to open %s"), curr_pack);
 +	}
 +
  	threads_active = 1;
  }
  
  static void cleanup_thread(void)
  {
 +	int i;
  	if (!threads_active)
  		return;
  	threads_active = 0;
@@@ -159,8 -154,6 +159,8 @@@
  	pthread_mutex_destroy(&work_mutex);
  	if (show_stat)
  		pthread_mutex_destroy(&deepest_delta_mutex);
 +	for (i = 0; i < nr_threads; i++)
 +		close(thread_data[i].pack_fd);
  	pthread_key_delete(key);
  	free(thread_data);
  }
@@@ -207,8 -200,13 +207,13 @@@ static unsigned check_object(struct obj
  	if (!(obj->flags & FLAG_CHECKED)) {
  		unsigned long size;
  		int type = sha1_object_info(obj->sha1, &size);
- 		if (type != obj->type || type <= 0)
- 			die(_("object of unexpected type"));
+ 		if (type <= 0)
+ 			die(_("did not receive expected object %s"),
+ 			      sha1_to_hex(obj->sha1));
+ 		if (type != obj->type)
+ 			die(_("object %s: expected type %s, found %s"),
+ 			    sha1_to_hex(obj->sha1),
+ 			    typename(obj->type), typename(type));
  		obj->flags |= FLAG_CHECKED;
  		return 1;
  	}
@@@ -295,13 -293,13 +300,13 @@@ static const char *open_pack_file(cons
  			output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
  		if (output_fd < 0)
  			die_errno(_("unable to create '%s'"), pack_name);
 -		pack_fd = output_fd;
 +		nothread_data.pack_fd = output_fd;
  	} else {
  		input_fd = open(pack_name, O_RDONLY);
  		if (input_fd < 0)
  			die_errno(_("cannot open packfile '%s'"), pack_name);
  		output_fd = -1;
 -		pack_fd = input_fd;
 +		nothread_data.pack_fd = input_fd;
  	}
  	git_SHA1_Init(&input_ctx);
  	return pack_name;
@@@ -549,7 -547,7 +554,7 @@@ static void *unpack_data(struct object_
  
  	do {
  		ssize_t n = (len < 64*1024) ? len : 64*1024;
 -		n = pread(pack_fd, inbuf, n, from);
 +		n = xpread(get_thread_data()->pack_fd, inbuf, n, from);
  		if (n < 0)
  			die_errno(_("cannot pread pack file"));
  		if (!n)
@@@ -1497,7 -1495,7 +1502,7 @@@ static void show_pack_info(int stat_onl
  int cmd_index_pack(int argc, const char **argv, const char *prefix)
  {
  	int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
 -	const char *curr_pack, *curr_index;
 +	const char *curr_index;
  	const char *index_name = NULL, *pack_name = NULL;
  	const char *keep_name = NULL, *keep_msg = NULL;
  	char *index_name_buf = NULL, *keep_name_buf = NULL;
@@@ -1509,7 -1507,7 +1514,7 @@@
  	if (argc == 2 && !strcmp(argv[1], "-h"))
  		usage(index_pack_usage);
  
 -	read_replace_refs = 0;
 +	check_replace_refs = 0;
  
  	reset_pack_idx_option(&opts);
  	git_config(git_index_pack_config, &opts);