undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/fmt-patch' into next

Browse Source 
* jc/fmt-patch:
  format-patch: resurrect extra headers from config
This commit is contained in:
Junio C Hamano 2006-06-02 13:50:31 -07:00
commit 283d3184df
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builtin-log.c
View File

@ -85,6 +85,23 @@ static int istitlechar(char c)
(c >= '0' && c <= '9') || c == '.' || c == '_'; (c >= '0' && c <= '9') || c == '.' || c == '_';
} }
static char *extra_headers = NULL;
static int extra_headers_size = 0;
static int git_format_config(const char *var, const char *value)
{
if (!strcmp(var, "format.headers")) {
int len = strlen(value);
extra_headers_size += len + 1;
extra_headers = realloc(extra_headers, extra_headers_size);
extra_headers[extra_headers_size - len - 1] = 0;
strcat(extra_headers, value);
return 0;
}
return git_default_config(var, value);
}
static FILE *realstdout = NULL; static FILE *realstdout = NULL;
static char *output_directory = NULL; static char *output_directory = NULL;
@ -162,6 +179,9 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
rev.ignore_merges = 1; rev.ignore_merges = 1;
rev.diffopt.output_format = DIFF_FORMAT_PATCH; rev.diffopt.output_format = DIFF_FORMAT_PATCH;
git_config(git_format_config);
rev.extra_headers = extra_headers;
/* /*
* Parse the arguments before setup_revisions(), or something * Parse the arguments before setup_revisions(), or something
* like "git fmt-patch -o a123 HEAD^.." may fail; a123 is * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is

8
log-tree.c
View File

@ -51,7 +51,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40; int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
const char *extra; const char *extra;
int len; int len;
char *subject = NULL, *after_subject = NULL; const char *subject = NULL, *extra_headers = opt->extra_headers;
opt->loginfo = NULL; opt->loginfo = NULL;
if (!opt->verbose_header) { if (!opt->verbose_header) {
@ -100,6 +100,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
static char subject_buffer[1024]; static char subject_buffer[1024];
static char buffer[1024]; static char buffer[1024];
snprintf(subject_buffer, sizeof(subject_buffer) - 1, snprintf(subject_buffer, sizeof(subject_buffer) - 1,
"%s"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: multipart/mixed;\n" "Content-Type: multipart/mixed;\n"
" boundary=\"%s%s\"\n" " boundary=\"%s%s\"\n"
@ -110,9 +111,10 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
"Content-Type: text/plain; " "Content-Type: text/plain; "
"charset=UTF-8; format=fixed\n" "charset=UTF-8; format=fixed\n"
"Content-Transfer-Encoding: 8bit\n\n", "Content-Transfer-Encoding: 8bit\n\n",
extra_headers ? extra_headers : "",
mime_boundary_leader, opt->mime_boundary, mime_boundary_leader, opt->mime_boundary,
mime_boundary_leader, opt->mime_boundary); mime_boundary_leader, opt->mime_boundary);
after_subject = subject_buffer; extra_headers = subject_buffer;
snprintf(buffer, sizeof(buffer) - 1, snprintf(buffer, sizeof(buffer) - 1,
"--%s%s\n" "--%s%s\n"
@ -141,7 +143,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
/* /*
* And then the pretty-printed message itself * And then the pretty-printed message itself
*/ */
len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, after_subject); len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, extra_headers);
if (opt->add_signoff) if (opt->add_signoff)
len = append_signoff(this_header, sizeof(this_header), len, len = append_signoff(this_header, sizeof(this_header), len,

1
revision.h
View File

@ -61,6 +61,7 @@ struct rev_info {
int nr, total; int nr, total;
const char *mime_boundary; const char *mime_boundary;
const char *add_signoff; const char *add_signoff;
const char *extra_headers;
/* special limits */ /* special limits */
int max_count; int max_count;