Merge branch 'bp/status-rename-config'

diff --git a/pack-objects.c b/pack-objects.c
index 08cfe68b6befe673abe78f99bd3d976449ce0152..92708522e76b4565882177f899612d72a3f6d75a 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -60,7 +60,7 @@ static void rehash_objects(struct packing_data *pdata)
                                                       &found);
 
                if (found)
-                       die("BUG: Duplicate object in hash");
+                       BUG("Duplicate object in hash");
 
                pdata->index[ix] = i + 1;
                entry++;
@@ -143,6 +143,9 @@ void prepare_packing_data(struct packing_data *pdata)
        } else {
                prepare_in_pack_by_idx(pdata);
        }
+
+       pdata->oe_size_limit = git_env_ulong("GIT_TEST_OE_SIZE",
+                                            1U << OE_SIZE_BITS);
 }
 
 struct object_entry *packlist_alloc(struct packing_data *pdata,