Merge branch 'mr/doc-can-not-to-cannot'

diff --git a/builtin/repack.c b/builtin/repack.c
index db93ca3660812e42c06d2b1dff00df1466db105f..632c0c0a79422a229d52c83665331501e8c54e29 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -89,17 +89,6 @@ static void remove_pack_on_signal(int signo)
        raise(signo);
 }
 
-static int has_pack_keep_file(void)
-{
-       struct packed_git *p;
-
-       for (p = get_all_packs(the_repository); p; p = p->next) {
-               if (p->pack_keep)
-                       return 1;
-       }
-       return 0;
-}
-
 /*
  * Adds all packs hex strings to the fname list, which do not
  * have a corresponding .keep file. These packs are not to
@@ -346,13 +335,11 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 
        if (write_bitmaps < 0) {
                if (!(pack_everything & ALL_INTO_ONE) ||
-                   !is_bare_repository() ||
-                   keep_pack_list.nr != 0 ||
-                   has_pack_keep_file())
+                   !is_bare_repository())
                        write_bitmaps = 0;
        }
        if (pack_kept_objects < 0)
-               pack_kept_objects = !!write_bitmaps;
+               pack_kept_objects = write_bitmaps > 0;
 
        if (write_bitmaps && !(pack_everything & ALL_INTO_ONE))
                die(_(incremental_bitmap_conflict_error));