Simplify is_kept_pack()

diff --git a/revision.c b/revision.c
index 795e0c03fef4c95cc0d45cb1515f38d8db8211eb..3cfd6539aba3baa35375690d3cb723c1ba7a0fcf 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -963,16 +963,6 @@ static void add_message_grep(struct rev_info *revs, const char *pattern)
        add_grep(revs, pattern, GREP_PATTERN_BODY);
 }
 
-static void add_ignore_packed(struct rev_info *revs, const char *name)
-{
-       int num = ++revs->num_ignore_packed;
-
-       revs->ignore_packed = xrealloc(revs->ignore_packed,
-                                      sizeof(const char *) * (num + 1));
-       revs->ignore_packed[num-1] = name;
-       revs->ignore_packed[num] = NULL;
-}
-
 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
                               int *unkc, const char **unkv)
 {
@@ -1072,12 +1062,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
                revs->edge_hint = 1;
        } else if (!strcmp(arg, "--unpacked")) {
                revs->unpacked = 1;
-               free(revs->ignore_packed);
-               revs->ignore_packed = NULL;
-               revs->num_ignore_packed = 0;
-       } else if (!prefixcmp(arg, "--unpacked=")) {
+               revs->kept_pack_only = 0;
+       } else if (!strcmp(arg, "--kept-pack-only")) {
                revs->unpacked = 1;
-               add_ignore_packed(revs, arg+11);
+               revs->kept_pack_only = 1;
+       } else if (!prefixcmp(arg, "--unpacked=")) {
+               die("--unpacked=<packfile> no longer supported.");
        } else if (!strcmp(arg, "-r")) {
                revs->diff = 1;
                DIFF_OPT_SET(&revs->diffopt, RECURSIVE);