Use diff_tree() directly in making cover letter
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Daniel Barkalow committed
Feb 28, 2008 at 12:14 UTC
39fe578bdcc318308bc5d75efa04bd4bfc3a4f23
1 file changed
+11
-14
builtin-log.c
+11
-14
@@ -647,8 +647,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
647
int nr, struct commit **list, struct commit *head)
648
{
649
const char *committer;
650
- const char *origin_sha1, *head_sha1;
651
- const char *argv[7];
650
+ char *head_sha1;
651
const char *subject_start = NULL;
652
const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
653
const char *msg;
@@ -657,6 +656,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
656
struct strbuf sb;
657
int i;
658
const char *encoding = "utf-8";
659
+ struct diff_options opts;
660
661
if (rev->commit_format != CMIT_FMT_EMAIL)
662
die("Cover letter needs email format");
@@ -694,20 +694,17 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
694
if (!origin)
695
return;
696
697
- origin_sha1 = sha1_to_hex(origin->object.sha1);
697
+ diff_setup(&opts);
698
+ opts.output_format |= DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
699
699
- argv[0] = "diff";
700
- argv[1] = "--stat";
701
- argv[2] = "--summary";
702
- argv[3] = head_sha1;
703
- argv[4] = "--not";
704
- argv[5] = origin_sha1;
705
- argv[6] = "--";
706
- argv[7] = NULL;
707
- fflush(stdout);
708
- run_command_v_opt(argv, RUN_GIT_CMD);
700
+ diff_setup_done(&opts);
701
+
702
+ diff_tree_sha1(origin->tree->object.sha1,
703
+ head->tree->object.sha1,
704
+ "", &opts);
705
+ diffcore_std(&opts);
706
+ diff_flush(&opts);
707
710
- fflush(stdout);
708
printf("\n");
709
}
710