repack: add `repack.packKeptObjects` config var

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 957392c1aed5eb18707d69ca039618a8977282d3..78250eab08abf692344277e01cb94fc5f5c2f807 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -485,9 +485,32 @@ static void handle_tag(const char *name, struct tag *tag)
               (int)message_size, (int)message_size, message ? message : "");
 }
 
+static struct commit *get_commit(struct rev_cmdline_entry *e, char *full_name)
+{
+       switch (e->item->type) {
+       case OBJ_COMMIT:
+               return (struct commit *)e->item;
+       case OBJ_TAG: {
+               struct tag *tag = (struct tag *)e->item;
+
+               /* handle nested tags */
+               while (tag && tag->object.type == OBJ_TAG) {
+                       parse_object(tag->object.sha1);
+                       string_list_append(&extra_refs, full_name)->util = tag;
+                       tag = (struct tag *)tag->tagged;
+               }
+               if (!tag)
+                       die("Tag %s points nowhere?", e->name);
+               return (struct commit *)tag;
+               break;
+       }
+       default:
+               return NULL;
+       }
+}
+
 static void get_tags_and_duplicates(struct rev_cmdline_info *info)
 {
-       struct tag *tag;
        int i;
 
        for (i = 0; i < info->nr; i++) {
@@ -502,41 +525,26 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info)
                if (dwim_ref(e->name, strlen(e->name), sha1, &full_name) != 1)
                        continue;
 
-               switch (e->item->type) {
-               case OBJ_COMMIT:
-                       commit = (struct commit *)e->item;
-                       break;
-               case OBJ_TAG:
-                       tag = (struct tag *)e->item;
-
-                       /* handle nested tags */
-                       while (tag && tag->object.type == OBJ_TAG) {
-                               parse_object(tag->object.sha1);
-                               string_list_append(&extra_refs, full_name)->util = tag;
-                               tag = (struct tag *)tag->tagged;
-                       }
-                       if (!tag)
-                               die ("Tag %s points nowhere?", e->name);
-                       switch(tag->object.type) {
-                       case OBJ_COMMIT:
-                               commit = (struct commit *)tag;
-                               break;
-                       case OBJ_BLOB:
-                               export_blob(tag->object.sha1);
-                               continue;
-                       default: /* OBJ_TAG (nested tags) is already handled */
-                               warning("Tag points to object of unexpected type %s, skipping.",
-                                       typename(tag->object.type));
-                               continue;
-                       }
-                       break;
-               default:
+               commit = get_commit(e, full_name);
+               if (!commit) {
                        warning("%s: Unexpected object of type %s, skipping.",
                                e->name,
                                typename(e->item->type));
                        continue;
                }
 
+               switch(commit->object.type) {
+               case OBJ_COMMIT:
+                       break;
+               case OBJ_BLOB:
+                       export_blob(commit->object.sha1);
+                       continue;
+               default: /* OBJ_TAG (nested tags) is already handled */
+                       warning("Tag points to object of unexpected type %s, skipping.",
+                               typename(commit->object.type));
+                       continue;
+               }
+
                /*
                 * This ref will not be updated through a commit, lets make
                 * sure it gets properly updated eventually.
@@ -673,11 +681,11 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
                             N_("Dump marks to this file")),
                OPT_STRING(0, "import-marks", &import_filename, N_("file"),
                             N_("Import marks from this file")),
-               OPT_BOOLEAN(0, "fake-missing-tagger", &fake_missing_tagger,
-                            N_("Fake a tagger when tags lack one")),
-               OPT_BOOLEAN(0, "full-tree", &full_tree,
-                            N_("Output full tree for each commit")),
-               OPT_BOOLEAN(0, "use-done-feature", &use_done_feature,
+               OPT_BOOL(0, "fake-missing-tagger", &fake_missing_tagger,
+                        N_("Fake a tagger when tags lack one")),
+               OPT_BOOL(0, "full-tree", &full_tree,
+                        N_("Output full tree for each commit")),
+               OPT_BOOL(0, "use-done-feature", &use_done_feature,
                             N_("Use the done feature to terminate the stream")),
                OPT_BOOL(0, "no-data", &no_data, N_("Skip output of blob data")),
                OPT_END()