Merge branch 'rs/mingw-path-lookup-simplify'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 82555e410abc192fa9f3bc7e8c6e16d6aba73c3d..80439047aa21b9291417cb6ef30164d41878b728 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2728,7 +2728,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)