mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format-patch: update append_signoff prototype

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2013-02-12 02:17:38 -08:00
committed by Junio C Hamano
parent 79133a66f7
commit 5289c56a72
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/log.c
View File

@ -1058,7 +1058,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
struct commit *origin = NULL, *head = NULL; struct commit *origin = NULL, *head = NULL;
const char *in_reply_to = NULL; const char *in_reply_to = NULL;
struct patch_ids ids; struct patch_ids ids;
char *add_signoff = NULL;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
int use_patch_format = 0; int use_patch_format = 0;
int quiet = 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_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
PARSE_OPT_KEEP_DASHDASH); 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++) { for (i = 0; i < extra_hdr.nr; i++) {
strbuf_addstr(&buf, extra_hdr.items[i].string); strbuf_addstr(&buf, extra_hdr.items[i].string);
strbuf_addch(&buf, '\n'); strbuf_addch(&buf, '\n');
@ -1354,7 +1343,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
total++; total++;
start_number--; start_number--;
} }
rev.add_signoff = add_signoff; rev.add_signoff = do_signoff;
while (0 <= --nr) { while (0 <= --nr) {
int shown; int shown;
commit = list[nr]; commit = list[nr];

17
log-tree.c
View File

@ -10,6 +10,8 @@
#include "color.h" #include "color.h"
#include "gpg-interface.h" #include "gpg-interface.h"
#define APPEND_SIGNOFF_DEDUP (1u <<0)
struct decoration name_decoration = { "object names" }; struct decoration name_decoration = { "object names" };
enum decoration_type { 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); size_t signoff_len = strlen(signoff);
int has_signoff = 0; int has_signoff = 0;
char *cp; char *cp;
@ -275,6 +280,7 @@ static void append_signoff(struct strbuf *sb, const char *signoff)
if (!isspace(cp[signoff_len])) if (!isspace(cp[signoff_len]))
continue; continue;
/* we already have him */ /* 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_addstr(sb, signed_off_by);
strbuf_add(sb, signoff, signoff_len); strbuf_add(sb, signoff, signoff_len);
strbuf_addch(sb, '\n'); 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) if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
ctx.need_8bit_cte = has_non_ascii(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 = opt->date_mode;
ctx.date_mode_explicit = opt->date_mode_explicit; ctx.date_mode_explicit = opt->date_mode_explicit;
ctx.abbrev = opt->diffopt.abbrev; ctx.abbrev = opt->diffopt.abbrev;
@ -674,7 +683,7 @@ void show_log(struct rev_info *opt)
pretty_print_commit(&ctx, commit, &msgbuf); pretty_print_commit(&ctx, commit, &msgbuf);
if (opt->add_signoff) if (opt->add_signoff)
append_signoff(&msgbuf, opt->add_signoff); append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP);
if ((ctx.fmt != CMIT_FMT_USERFORMAT) && if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
ctx.notes_message && *ctx.notes_message) { ctx.notes_message && *ctx.notes_message) {

2
revision.h
View File

@ -137,7 +137,7 @@ struct rev_info {
int numbered_files; int numbered_files;
char *message_id; char *message_id;
struct string_list *ref_message_ids; struct string_list *ref_message_ids;
const char *add_signoff; int add_signoff;
const char *extra_headers; const char *extra_headers;
const char *log_reencode; const char *log_reencode;
const char *subject_prefix; const char *subject_prefix;