about summary refs log tree commit diff stats
path: root/ui-patch.c
diff options
context:
space:
mode:
authorJohn Keeping2014-12-28 13:10:33 +0000
committerJason A. Donenfeld2014-12-28 14:44:44 +0100
commit7552266aaccb9445e082fc04215afcb55ad543d8 (patch)
treea0e40b860a87415d2a097cae63b2332c639f2b89 /ui-patch.c
parentt0108: modernize style (diff)
downloadcgit-7552266aaccb9445e082fc04215afcb55ad543d8.tar.gz
cgit-7552266aaccb9445e082fc04215afcb55ad543d8.zip
ui-patch: match git-format-patch(1) output
Using (DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH) causes Git to emit a
"---" line between the commit message and the body of the patch, which
fixes a regression introduced in commit 455b598 (ui-patch.c: Use
log_tree_commit() to generate diffs, 2013-08-20), prior to which we
inserted the "---" line ourselves.

DIFF_FORMAT_SUMMARY is added so that we match the output of
git-format-patch(1) without the "-p" option.

Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-patch.c')
-rw-r--r--ui-patch.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui-patch.c b/ui-patch.c index fc6c145..6ec89b4 100644 --- a/ui-patch.c +++ b/ui-patch.c
@@ -73,7 +73,8 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
73 rev.diff = 1; 73 rev.diff = 1;
74 rev.show_root_diff = 1; 74 rev.show_root_diff = 1;
75 rev.max_parents = 1; 75 rev.max_parents = 1;
76 rev.diffopt.output_format |= DIFF_FORMAT_PATCH; 76 rev.diffopt.output_format |= DIFF_FORMAT_DIFFSTAT |
77 DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;
77 setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev, 78 setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
78 NULL); 79 NULL);
79 prepare_revision_walk(&rev); 80 prepare_revision_walk(&rev);