Commit Diff

Commit:
a605f678a4427d849df6c8fb3d4c316fdecee768
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
fix a bug where 'gotadmin pack' packed too many objects unless -a was used
Actions:
Patch | Tree
commit - 4b06140e73e558a1f44007eda8bbdc912a6c0a9c
commit + a605f678a4427d849df6c8fb3d4c316fdecee768
blob - da8744f9af4f95965828446e43a49da058ce0946
blob + 083f5181110da578dfb7efe24a2965a853ec74cd
--- lib/pack_create.c
+++ lib/pack_create.c
@@ -861,7 +861,7 @@ add_object(int want_meta, struct got_object_idset *ids
 		err = search_packidx(&is_packed, id, repo);
 		if (err)
 			return err;
-		if (is_packed)
+		if (is_packed && want_meta)
 			return NULL;
 	}
 
@@ -1025,7 +1025,7 @@ load_commit(int want_meta, struct got_object_idset *id
 		err = search_packidx(&is_packed, id, repo);
 		if (err)
 			return err;
-		if (is_packed)
+		if (is_packed && want_meta)
 			return NULL;
 	}
 
@@ -1072,7 +1072,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;
 	}