From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 5 Feb 2019 22:26:16 +0000 (-0800)
Subject: Merge branch 'ph/pack-objects-mutex-fix'
X-Git-Tag: v2.21.0-rc0~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d243a323a545da68b87149e885f2e440f0b13725;p=thirdparty%2Fgit.git

Merge branch 'ph/pack-objects-mutex-fix'

"git pack-objects" incorrectly used uninitialized mutex, which has
been corrected.

* ph/pack-objects-mutex-fix:
  pack-objects: merge read_lock and lock in packing_data struct
  pack-objects: move read mutex to packing_data struct
---

d243a323a545da68b87149e885f2e440f0b13725
diff --cc pack-objects.h
index 3cd8d1f00a,1667cbad8f..6bfacc7d2c
--- a/pack-objects.h
+++ b/pack-objects.h
@@@ -166,11 -167,12 +170,12 @@@ struct packing_data 
  	unsigned char *layer;
  };
  
 -void prepare_packing_data(struct packing_data *pdata);
 +void prepare_packing_data(struct repository *r, struct packing_data *pdata);
  
+ /* Protect access to object database */
  static inline void packing_data_lock(struct packing_data *pdata)
  {
- 	pthread_mutex_lock(&pdata->lock);
+ 	pthread_mutex_lock(&pdata->odb_lock);
  }
  static inline void packing_data_unlock(struct packing_data *pdata)
  {