pack-objects: disable pack reuse for object-selection options

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 8841f8b366b4cee57d13a9086071351f849ddbba..9cd13dfdbe914f68e93cb5af65b7b97f268809f7 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2635,7 +2635,11 @@ static void loosen_unused_packed_objects(struct rev_info *revs)
  */
 static int pack_options_allow_reuse(void)
 {
-       return pack_to_stdout && allow_ofs_delta;
+       return pack_to_stdout &&
+              allow_ofs_delta &&
+              !ignore_packed_keep &&
+              (!local || !have_non_local_packs) &&
+              !incremental;
 }
 
 static int get_object_list_from_bitmap(struct rev_info *revs)