format-patch: update append_signoff prototype

This is a preparation step for merging with append_signoff from
sequencer.c

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Brandon Casey <bcasey@nvidia.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/log.c b/builtin/log.c
index e7b7db1cacf1934a9bb0b96beb98ddda15a66074..bb48344113cc3ab0e0a9fc4aba0408b43b4637a9 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1058,7 +1058,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        struct commit *origin = NULL, *head = NULL;
        const char *in_reply_to = NULL;
        struct patch_ids ids;
        struct commit *origin = NULL, *head = NULL;
        const char *in_reply_to = NULL;
        struct patch_ids ids;

-       char *add_signoff = NULL;

        struct strbuf buf = STRBUF_INIT;
        int use_patch_format = 0;
        int quiet = 0;
        struct strbuf buf = STRBUF_INIT;
        int use_patch_format = 0;
        int quiet = 0;


@@ -1154,16 +1153,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                             PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
                             PARSE_OPT_KEEP_DASHDASH);
 
                             PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
                             PARSE_OPT_KEEP_DASHDASH);
 

-       if (do_signoff) {
-               const char *committer;
-               const char *endpos;
-               committer = git_committer_info(IDENT_STRICT);
-               endpos = strchr(committer, '>');
-               if (!endpos)
-                       die(_("bogus committer info %s"), committer);
-               add_signoff = xmemdupz(committer, endpos - committer + 1);
-       }
-

        for (i = 0; i < extra_hdr.nr; i++) {
                strbuf_addstr(&buf, extra_hdr.items[i].string);
                strbuf_addch(&buf, '\n');
        for (i = 0; i < extra_hdr.nr; i++) {
                strbuf_addstr(&buf, extra_hdr.items[i].string);
                strbuf_addch(&buf, '\n');


@@ -1354,7 +1343,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                total++;
                start_number--;
        }
                total++;
                start_number--;
        }

-       rev.add_signoff = add_signoff;
+       rev.add_signoff = do_signoff;

        while (0 <= --nr) {
                int shown;
                commit = list[nr];
        while (0 <= --nr) {
                int shown;
                commit = list[nr];

diff --git a/log-tree.c b/log-tree.c
index 4f86defe324bac8374585df5d9e8ef7b5f9a3524..e3044a3e948bc23d88c2dafb5809f424ae8fce28 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -10,6 +10,8 @@
 #include "color.h"
 #include "gpg-interface.h"
 
 #include "color.h"
 #include "gpg-interface.h"
 

+#define APPEND_SIGNOFF_DEDUP (1u <<0)
+

 struct decoration name_decoration = { "object names" };
 
 enum decoration_type {
 struct decoration name_decoration = { "object names" };
 
 enum decoration_type {


@@ -253,9 +255,12 @@ static int detect_any_signoff(char *letter, int size)
        return seen_head && seen_name;
 }
 
        return seen_head && seen_name;
 }
 

-static void append_signoff(struct strbuf *sb, const char *signoff)
+static void append_signoff(struct strbuf *sb, int ignore_footer, unsigned flag)

 {
 {

+       unsigned no_dup_sob = flag & APPEND_SIGNOFF_DEDUP;

        static const char signed_off_by[] = "Signed-off-by: ";
        static const char signed_off_by[] = "Signed-off-by: ";

+       char *signoff = xstrdup(fmt_name(getenv("GIT_COMMITTER_NAME"),
+                                              getenv("GIT_COMMITTER_EMAIL")));

        size_t signoff_len = strlen(signoff);
        int has_signoff = 0;
        char *cp;
        size_t signoff_len = strlen(signoff);
        int has_signoff = 0;
        char *cp;


@@ -275,6 +280,7 @@ static void append_signoff(struct strbuf *sb, const char *signoff)
                if (!isspace(cp[signoff_len]))
                        continue;
                /* we already have him */
                if (!isspace(cp[signoff_len]))
                        continue;
                /* we already have him */

+               free(signoff);

                return;
        }
 
                return;
        }
 


@@ -287,6 +293,7 @@ static void append_signoff(struct strbuf *sb, const char *signoff)
        strbuf_addstr(sb, signed_off_by);
        strbuf_add(sb, signoff, signoff_len);
        strbuf_addch(sb, '\n');
        strbuf_addstr(sb, signed_off_by);
        strbuf_add(sb, signoff, signoff_len);
        strbuf_addch(sb, '\n');

+       free(signoff);

 }
 
 static unsigned int digits_in_number(unsigned int number)
 }
 
 static unsigned int digits_in_number(unsigned int number)


@@ -662,8 +669,10 @@ void show_log(struct rev_info *opt)
        /*
         * And then the pretty-printed message itself
         */
        /*
         * And then the pretty-printed message itself
         */

-       if (ctx.need_8bit_cte >= 0)
-               ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
+       if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
+               ctx.need_8bit_cte =
+                       has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"),
+                                              getenv("GIT_COMMITTER_EMAIL")));

        ctx.date_mode = opt->date_mode;
        ctx.date_mode_explicit = opt->date_mode_explicit;
        ctx.abbrev = opt->diffopt.abbrev;
        ctx.date_mode = opt->date_mode;
        ctx.date_mode_explicit = opt->date_mode_explicit;
        ctx.abbrev = opt->diffopt.abbrev;


@@ -674,7 +683,7 @@ void show_log(struct rev_info *opt)
        pretty_print_commit(&ctx, commit, &msgbuf);
 
        if (opt->add_signoff)
        pretty_print_commit(&ctx, commit, &msgbuf);
 
        if (opt->add_signoff)

-               append_signoff(&msgbuf, opt->add_signoff);
+               append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP);

 
        if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
            ctx.notes_message && *ctx.notes_message) {
 
        if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
            ctx.notes_message && *ctx.notes_message) {

diff --git a/revision.h b/revision.h
index 059bfff812da8033681aa11c5a9ca9085881747e..d20defabd5ea448f6a55fc6ad08e8a534177da3d 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -137,7 +137,7 @@ struct rev_info {
        int             numbered_files;
        char            *message_id;
        struct string_list *ref_message_ids;
        int             numbered_files;
        char            *message_id;
        struct string_list *ref_message_ids;

-       const char      *add_signoff;
+       int             add_signoff;

        const char      *extra_headers;
        const char      *log_reencode;
        const char      *subject_prefix;
        const char      *extra_headers;
        const char      *log_reencode;
        const char      *subject_prefix;