global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-11 01:10:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

diff-* --patch-with-raw

Browse Source 
This new flag outputs the diff-raw output and diff-patch output
at the same time.  Requested by Cogito.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-04-10 17:36:53 -07:00
parent 944e3a88fe
commit 86ff1d2012
3 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
combine-diff.c
View File

@@ -832,6 +832,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
diffopts = *opt;
diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
diffopts.with_raw = 0;
diffopts.recursive = 1;
/* count parents */
@@ -858,6 +859,16 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
num_paths++;
}
if (num_paths) {
if (opt->with_raw) {
int saved_format = opt->output_format;
opt->output_format = DIFF_FORMAT_RAW;
for (p = paths; p; p = p->next) {
if (show_combined_diff(p, num_parent, dense,
header, opt))
header = NULL;
}
opt->output_format = saved_format;
}
for (p = paths; p; p = p->next) {
if (show_combined_diff(p, num_parent, dense,
header, opt))