gitweb: Put project README in div.readme, fix its padding

diff --git a/builtin-name-rev.c b/builtin-name-rev.c
index 03083e94776234b280316978cd3f638262f41398..a0c89a827b666d8e01ba64597b732205ce1a643e 100644 (file)
--- a/builtin-name-rev.c
+++ b/builtin-name-rev.c
@@ -3,12 +3,10 @@
 #include "commit.h"
 #include "tag.h"
 #include "refs.h"
+#include "parse-options.h"
 
 #define CUTOFF_DATE_SLOP 86400 /* one day */
 
-static const char name_rev_usage[] =
-       "git-name-rev [--tags | --refs=<pattern>] ( --all | --stdin | committish [committish...] )\n";
-
 typedef struct rev_name {
        const char *tip_name;
        int generation;
@@ -153,51 +151,41 @@ static const char* get_rev_name(struct object *o)
        }
 }
 
+static char const * const name_rev_usage[] = {
+       "git-name-rev [options] ( --all | --stdin | <commit>... )",
+       NULL
+};
+
 int cmd_name_rev(int argc, const char **argv, const char *prefix)
 {
        struct object_array revs = { 0, 0, NULL };
-       int as_is = 0, all = 0, transform_stdin = 0;
+       int all = 0, transform_stdin = 0;
        struct name_ref_data data = { 0, 0, NULL };
+       struct option opts[] = {
+               OPT_BOOLEAN(0, "name-only", &data.name_only, "print only names (no SHA-1)"),
+               OPT_BOOLEAN(0, "tags", &data.tags_only, "only use tags to name the commits"),
+               OPT_STRING(0, "refs", &data.ref_filter, "pattern",
+                                  "only use refs matching <pattern>"),
+               OPT_GROUP(""),
+               OPT_BOOLEAN(0, "all", &all, "list all commits reachable from all refs"),
+               OPT_BOOLEAN(0, "stdin", &transform_stdin, "read from stdin"),
+               OPT_END(),
+       };
 
        git_config(git_default_config);
+       argc = parse_options(argc, argv, opts, name_rev_usage, 0);
+       if (!!all + !!transform_stdin + !!argc > 1) {
+               error("Specify either a list, or --all, not both!");
+               usage_with_options(name_rev_usage, opts);
+       }
+       if (all || transform_stdin)
+               cutoff = 0;
 
-       if (argc < 2)
-               usage(name_rev_usage);
-
-       for (--argc, ++argv; argc; --argc, ++argv) {
+       for (; argc; argc--, argv++) {
                unsigned char sha1[20];
                struct object *o;
                struct commit *commit;
 
-               if (!as_is && (*argv)[0] == '-') {
-                       if (!strcmp(*argv, "--")) {
-                               as_is = 1;
-                               continue;
-                       } else if (!strcmp(*argv, "--name-only")) {
-                               data.name_only = 1;
-                               continue;
-                       } else if (!strcmp(*argv, "--tags")) {
-                               data.tags_only = 1;
-                               continue;
-                       } else  if (!prefixcmp(*argv, "--refs=")) {
-                               data.ref_filter = *argv + 7;
-                               continue;
-                       } else if (!strcmp(*argv, "--all")) {
-                               if (argc > 1)
-                                       die("Specify either a list, or --all, not both!");
-                               all = 1;
-                               cutoff = 0;
-                               continue;
-                       } else if (!strcmp(*argv, "--stdin")) {
-                               if (argc > 1)
-                                       die("Specify either a list, or --stdin, not both!");
-                               transform_stdin = 1;
-                               cutoff = 0;
-                               continue;
-                       }
-                       usage(name_rev_usage);
-               }
-
                if (get_sha1(*argv, sha1)) {
                        fprintf(stderr, "Could not get sha1 for %s. Skipping.\n",
                                        *argv);
@@ -212,10 +200,8 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
                }
 
                commit = (struct commit *)o;
-
                if (cutoff > commit->date)
                        cutoff = commit->date;
-
                add_object_array((struct object *)commit, *argv, &revs);
        }