From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brandon Casey Subject: [PATCH v4 11/12] format-patch: update append_signoff prototype Date: Tue, 12 Feb 2013 02:17:38 -0800 Message-ID: <1360664260-11803-12-git-send-email-drafnel@gmail.com> References: <1360664260-11803-1-git-send-email-drafnel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: gitster@pobox.com, pclouds@gmail.com, jrnieder@gmail.com, Brandon Casey To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Feb 12 11:19:07 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1U5Cx3-0002yo-Kh for gcvg-git-2@plane.gmane.org; Tue, 12 Feb 2013 11:19:01 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932978Ab3BLKSj convert rfc822-to-quoted-printable (ORCPT ); Tue, 12 Feb 2013 05:18:39 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:59875 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932138Ab3BLKSh (ORCPT ); Tue, 12 Feb 2013 05:18:37 -0500 Received: by mail-pa0-f44.google.com with SMTP id kp1so9774pab.3 for ; Tue, 12 Feb 2013 02:18:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=vTsO87peChCx8GuKZx1jcZsDgmuZgZl+bvnDXB+JPA8=; b=pS0Iqn90MqvtKfFxp0AmZiJmLKFSwdKwMVCMxlGBAfF4J3Sq3hungHy1ec6osllpMA Pgv3vEFiOuCOtafrGyFlkTYv1MePhPHHZRH1NfGdUwojdtoKy0+pHktE7ZtrNrOrQuSa VE3uEYnAX8t1hX268wSjY5DbiLAtSOYQRrWvGsWze+qI7yU80h6BB3oOD5tVqnzvw84s FKnTaintyknB6egnIEmYQAkp/SCZdozDn0SGC+M7ENTDJdpliz+Q9d/kX0Nd9MLDqIov LKkiyIE2nufYKQZQYDZyxQGQXIzGQDberI84e9ctP5BKLpGrRSknJY4NNT6AO5FKFve3 V5pg== X-Received: by 10.66.83.136 with SMTP id q8mr50716799pay.83.1360664316407; Tue, 12 Feb 2013 02:18:36 -0800 (PST) Received: from charliebrown.hsd1.ca.comcast.net (c-98-248-42-122.hsd1.ca.comcast.net. [98.248.42.122]) by mx.google.com with ESMTPS id l5sm73839001pax.10.2013.02.12.02.18.33 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Feb 2013 02:18:35 -0800 (PST) X-Mailer: git-send-email 1.8.1.1.252.gdb33759 In-Reply-To: <1360664260-11803-1-git-send-email-drafnel@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: =46rom: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy This is a preparation step for merging with append_signoff from sequencer.c Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Signed-off-by: Brandon Casey Reviewed-by: Jonathan Nieder --- 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 =3D NULL, *head =3D NULL; const char *in_reply_to =3D NULL; struct patch_ids ids; - char *add_signoff =3D NULL; struct strbuf buf =3D STRBUF_INIT; int use_patch_format =3D 0; int quiet =3D 0; @@ -1193,16 +1192,6 @@ int cmd_format_patch(int argc, const char **argv= , const char *prefix) rev.subject_prefix =3D strbuf_detach(&sprefix, NULL); } =20 - if (do_signoff) { - const char *committer; - const char *endpos; - committer =3D git_committer_info(IDENT_STRICT); - endpos =3D strchr(committer, '>'); - if (!endpos) - die(_("bogus committer info %s"), committer); - add_signoff =3D xmemdupz(committer, endpos - committer + 1); - } - for (i =3D 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 =3D add_signoff; + rev.add_signoff =3D do_signoff; while (0 <=3D --nr) { int shown; commit =3D 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" =20 +#define APPEND_SIGNOFF_DEDUP (1u <<0) + struct decoration name_decoration =3D { "object names" }; =20 enum decoration_type { @@ -253,9 +255,12 @@ static int detect_any_signoff(char *letter, int si= ze) return seen_head && seen_name; } =20 -static void append_signoff(struct strbuf *sb, const char *signoff) +static void append_signoff(struct strbuf *sb, int ignore_footer, unsig= ned flag) { + unsigned no_dup_sob =3D flag & APPEND_SIGNOFF_DEDUP; static const char signed_off_by[] =3D "Signed-off-by: "; + char *signoff =3D xstrdup(fmt_name(getenv("GIT_COMMITTER_NAME"), + getenv("GIT_COMMITTER_EMAIL"))); size_t signoff_len =3D strlen(signoff); int has_signoff =3D 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; } =20 @@ -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); } =20 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 >=3D 0) - ctx.need_8bit_cte =3D has_non_ascii(opt->add_signoff); + if (ctx.need_8bit_cte >=3D 0 && opt->add_signoff) + ctx.need_8bit_cte =3D + has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"), + getenv("GIT_COMMITTER_EMAIL"))); ctx.date_mode =3D opt->date_mode; ctx.date_mode_explicit =3D opt->date_mode_explicit; ctx.abbrev =3D opt->diffopt.abbrev; @@ -686,7 +695,7 @@ void show_log(struct rev_info *opt) pretty_print_commit(&ctx, commit, &msgbuf); =20 if (opt->add_signoff) - append_signoff(&msgbuf, opt->add_signoff); + append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP); =20 if ((ctx.fmt !=3D 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; --=20 1.8.1.3.579.gd9af3b6