Commit cdeb891a2479c24d74198d39285be4c75c366c3f

Stefan Sperling 2022-03-21T15:52:15

fix a bug where 'gotadmin pack' packed too many objects unless -a was used

diff --git a/lib/pack_create.c b/lib/pack_create.c
index 3cd0e26..d758916 100644
--- a/lib/pack_create.c
+++ b/lib/pack_create.c
@@ -862,7 +862,7 @@ add_object(int want_meta, struct got_object_idset *idset,
 		err = search_packidx(&is_packed, id, repo);
 		if (err)
 			return err;
-		if (is_packed)
+		if (is_packed && want_meta)
 			return NULL;
 	}
 
@@ -1026,7 +1026,7 @@ load_commit(int want_meta, struct got_object_idset *idset,
 		err = search_packidx(&is_packed, id, repo);
 		if (err)
 			return err;
-		if (is_packed)
+		if (is_packed && want_meta)
 			return NULL;
 	}
 
@@ -1073,7 +1073,7 @@ load_tag(int want_meta, struct got_object_idset *idset,
 		err = search_packidx(&is_packed, id, repo);
 		if (err)
 			return err;
-		if (is_packed)
+		if (is_packed && want_meta)
 			return NULL;
 	}