pull --rebase: exit early when the working directory is dirty
[gitweb.git] / builtin-prune.c
index bb8ead92cf41c3cbdbc421a1490fb40ce19f11c3..25f9304b829c9074e8a034eba5e34c38794058a4 100644 (file)
@@ -4,8 +4,12 @@
 #include "revision.h"
 #include "builtin.h"
 #include "reachable.h"
+#include "parse-options.h"
 
-static const char prune_usage[] = "git-prune [-n]";
+static const char * const prune_usage[] = {
+       "git-prune [-n] [--expire <time>] [--] [<head>...]",
+       NULL
+};
 static int show_only;
 static unsigned long expire;
 
@@ -123,32 +127,33 @@ static void remove_temporary_files(void)
 
 int cmd_prune(int argc, const char **argv, const char *prefix)
 {
-       int i;
        struct rev_info revs;
-
-       for (i = 1; i < argc; i++) {
-               const char *arg = argv[i];
-               if (!strcmp(arg, "-n")) {
-                       show_only = 1;
-                       continue;
-               }
-               if (!strcmp(arg, "--expire")) {
-                       if (++i < argc) {
-                               expire = approxidate(argv[i]);
-                               continue;
-                       }
-               }
-               else if (!prefixcmp(arg, "--expire=")) {
-                       expire = approxidate(arg + 9);
-                       continue;
-               }
-               usage(prune_usage);
-       }
+       const struct option options[] = {
+               OPT_BOOLEAN('n', NULL, &show_only,
+                           "do not remove, show only"),
+               OPT_DATE(0, "expire", &expire,
+                        "expire objects older than <time>"),
+               OPT_END()
+       };
 
        save_commit_buffer = 0;
        init_revisions(&revs, prefix);
-       mark_reachable_objects(&revs, 1);
 
+       argc = parse_options(argc, argv, options, prune_usage, 0);
+       while (argc--) {
+               unsigned char sha1[20];
+               const char *name = *argv++;
+
+               if (!get_sha1(name, sha1)) {
+                       struct object *object = parse_object(sha1);
+                       if (!object)
+                               die("bad object: %s", name);
+                       add_pending_object(&revs, object, "");
+               }
+               else
+                       die("unrecognized argument: %s", name);
+       }
+       mark_reachable_objects(&revs, 1);
        prune_object_dir(get_object_directory());
 
        sync();