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

Use diff_tree() directly in making cover letter

Browse Source 
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Daniel Barkalow 2008-02-28 12:14:13 -05:00 committed by Junio C Hamano
parent 00183cbb3d
commit 39fe578bdc
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
builtin-log.c
View File

@ -647,8 +647,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
int nr, struct commit **list, struct commit *head) int nr, struct commit **list, struct commit *head)
{ {
const char *committer; const char *committer;
const char *origin_sha1, *head_sha1; char *head_sha1;
const char *argv[7];
const char *subject_start = NULL; const char *subject_start = NULL;
const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n"; const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
const char *msg; const char *msg;
@ -657,6 +656,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
struct strbuf sb; struct strbuf sb;
int i; int i;
const char *encoding = "utf-8"; const char *encoding = "utf-8";
struct diff_options opts;
if (rev->commit_format != CMIT_FMT_EMAIL) if (rev->commit_format != CMIT_FMT_EMAIL)
die("Cover letter needs email format"); die("Cover letter needs email format");
@ -694,20 +694,17 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
if (!origin) if (!origin)
return; return;
origin_sha1 = sha1_to_hex(origin->object.sha1); diff_setup(&opts);
opts.output_format |= DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
argv[0] = "diff"; diff_setup_done(&opts);
argv[1] = "--stat";
argv[2] = "--summary"; diff_tree_sha1(origin->tree->object.sha1,
argv[3] = head_sha1; head->tree->object.sha1,
argv[4] = "--not"; "", &opts);
argv[5] = origin_sha1; diffcore_std(&opts);
argv[6] = "--"; diff_flush(&opts);
argv[7] = NULL;
fflush(stdout);
run_command_v_opt(argv, RUN_GIT_CMD);
fflush(stdout);
printf("\n"); printf("\n");
} }