xdl_merge(): make XDL_MERGE_ZEALOUS output simpler

diff --git a/builtin-log.c b/builtin-log.c
index b6a11220e258468bddd92181bf18ce55343abf2e..99d69f079132ed67e2d5bc83bf95e6e60ba22f6f 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -18,9 +18,6 @@
 static int default_show_root = 1;
 static const char *fmt_patch_subject_prefix = "PATCH";
 
-/* this is in builtin-diff.c */
-void add_head(struct rev_info *revs);
-
 static void add_name_decoration(const char *prefix, const char *name, struct object *obj)
 {
        int plen = strlen(prefix);
@@ -222,7 +219,7 @@ static int git_log_config(const char *var, const char *value)
 {
        if (!strcmp(var, "format.subjectprefix")) {
                if (!value)
-                       die("format.subjectprefix without value");
+                       config_error_nonbool(var);
                fmt_patch_subject_prefix = xstrdup(value);
                return 0;
        }
@@ -247,7 +244,28 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix)
        return cmd_log_walk(&rev);
 }
 
-static int show_object(const unsigned char *sha1, int suppress_header)
+static void show_tagger(char *buf, int len, struct rev_info *rev)
+{
+       char *email_end, *p;
+       unsigned long date;
+       int tz;
+
+       email_end = memchr(buf, '>', len);
+       if (!email_end)
+               return;
+       p = ++email_end;
+       while (isspace(*p))
+               p++;
+       date = strtoul(p, &p, 10);
+       while (isspace(*p))
+               p++;
+       tz = (int)strtol(p, NULL, 10);
+       printf("Tagger: %.*s\nDate:   %s\n", (int)(email_end - buf), buf,
+              show_date(date, tz, rev->date_mode));
+}
+
+static int show_object(const unsigned char *sha1, int show_tag_object,
+       struct rev_info *rev)
 {
        unsigned long size;
        enum object_type type;
@@ -257,11 +275,14 @@ static int show_object(const unsigned char *sha1, int suppress_header)
        if (!buf)
                return error("Could not read object %s", sha1_to_hex(sha1));
 
-       if (suppress_header)
-               while (offset < size && buf[offset++] != '\n') {
-                       int new_offset = offset;
+       if (show_tag_object)
+               while (offset < size && buf[offset] != '\n') {
+                       int new_offset = offset + 1;
                        while (new_offset < size && buf[new_offset++] != '\n')
                                ; /* do nothing */
+                       if (!prefixcmp(buf + offset, "tagger "))
+                               show_tagger(buf + offset + 7,
+                                           new_offset - offset - 7, rev);
                        offset = new_offset;
                }
 
@@ -302,16 +323,16 @@ int cmd_show(int argc, const char **argv, const char *prefix)
                const char *name = objects[i].name;
                switch (o->type) {
                case OBJ_BLOB:
-                       ret = show_object(o->sha1, 0);
+                       ret = show_object(o->sha1, 0, NULL);
                        break;
                case OBJ_TAG: {
                        struct tag *t = (struct tag *)o;
 
-                       printf("%stag %s%s\n\n",
+                       printf("%stag %s%s\n",
                                        diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
                                        t->tag,
                                        diff_get_color_opt(&rev.diffopt, DIFF_RESET));
-                       ret = show_object(o->sha1, 1);
+                       ret = show_object(o->sha1, 1, &rev);
                        objects[i].item = (struct object *)t->tagged;
                        i--;
                        break;
@@ -411,7 +432,7 @@ static int git_format_config(const char *var, const char *value)
        }
        if (!strcmp(var, "format.suffix")) {
                if (!value)
-                       die("format.suffix without value");
+                       return config_error_nonbool(var);
                fmt_patch_suffix = xstrdup(value);
                return 0;
        }
@@ -419,11 +440,10 @@ static int git_format_config(const char *var, const char *value)
                return 0;
        }
        if (!strcmp(var, "format.numbered")) {
-               if (!strcasecmp(value, "auto")) {
+               if (value && !strcasecmp(value, "auto")) {
                        auto_number = 1;
                        return 0;
                }
-
                numbered = git_config_bool(var, value);
                return 0;
        }
@@ -746,7 +766,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                         * does not have.
                         */
                        rev.pending.objects[0].item->flags |= UNINTERESTING;
-                       add_head(&rev);
+                       add_head_to_pending(&rev);
                }
                /*
                 * Otherwise, it is "format-patch -22 HEAD", and/or