Re: [PATCH v4 11/12] format-patch: update append_signoff prototype

> From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
>
> 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>
> ---
>  builtin/log.c | 13 +------------
>  log-tree.c    | 17 +++++++++++++----
>  revision.h    |  2 +-
>  3 files changed, 15 insertions(+), 17 deletions(-)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index 8f0b2e8..59de484 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -1086,7 +1086,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;
> -	char *add_signoff = NULL;
>  	struct strbuf buf = STRBUF_INIT;
>  	int use_patch_format = 0;
>  	int quiet = 0;
> @@ -1193,16 +1192,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
>  		rev.subject_prefix = strbuf_detach(&sprefix, NULL);
>  	}
>  
> -	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');
> @@ -1393,7 +1382,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
>  		total++;
>  		start_number--;
>  	}
> -	rev.add_signoff = add_signoff;
> +	rev.add_signoff = do_signoff;
>  	while (0 <= --nr) {
>  		int shown;
>  		commit = list[nr];
> diff --git a/log-tree.c b/log-tree.c
> index 5dc45c4..ac1cd68 100644
> --- a/log-tree.c
> +++ b/log-tree.c
> @@ -10,6 +10,8 @@
>  #include "color.h"
>  #include "gpg-interface.h"
>  
> +#define APPEND_SIGNOFF_DEDUP (1u <<0)
> +
>  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;
>  }
>  
> -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: ";
> +	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;
> @@ -275,6 +280,7 @@ static void append_signoff(struct strbuf *sb, const char *signoff)
>  		if (!isspace(cp[signoff_len]))
>  			continue;
>  		/* we already have him */
> +		free(signoff);
>  		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');
> +	free(signoff);
>  }
>  
>  static unsigned int digits_in_number(unsigned int number)
> @@ -672,8 +679,10 @@ void show_log(struct rev_info *opt)
>  	/*
>  	 * 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;
> @@ -686,7 +695,7 @@ void show_log(struct rev_info *opt)
>  	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) {
> diff --git a/revision.h b/revision.h
> index 5da09ee..01bd2b7 100644
> --- a/revision.h
> +++ b/revision.h
> @@ -138,7 +138,7 @@ struct rev_info {
>  	int		reroll_count;
>  	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;